From 0c06a0f3687672a227c934a30d56f306e925f8b1 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 29 Nov 2019 15:46:22 +0100 Subject: [PATCH 001/109] release: bump version to 1.23.0 (development) --- configure.ac | 4 ++-- libnm-core/nm-version.h | 14 ++++++++++++++ meson.build | 2 +- shared/nm-version-macros.h.in | 1 + 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 82f64b729a..12e1663e36 100644 --- a/configure.ac +++ b/configure.ac @@ -7,8 +7,8 @@ dnl - add corresponding NM_VERSION_x_y_z macros in dnl "shared/nm-version-macros.h.in" dnl - update number in meson.build m4_define([nm_major_version], [1]) -m4_define([nm_minor_version], [21]) -m4_define([nm_micro_version], [90]) +m4_define([nm_minor_version], [23]) +m4_define([nm_micro_version], [0]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h index 3180c7e26a..e8a94db648 100644 --- a/libnm-core/nm-version.h +++ b/libnm-core/nm-version.h @@ -215,6 +215,20 @@ # define NM_AVAILABLE_IN_1_22 #endif +#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_24 +# define NM_DEPRECATED_IN_1_24 G_DEPRECATED +# define NM_DEPRECATED_IN_1_24_FOR(f) G_DEPRECATED_FOR(f) +#else +# define NM_DEPRECATED_IN_1_24 +# define NM_DEPRECATED_IN_1_24_FOR(f) +#endif + +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_24 +# define NM_AVAILABLE_IN_1_24 G_UNAVAILABLE(1,24) +#else +# define NM_AVAILABLE_IN_1_24 +#endif + /* * Synchronous API for calling D-Bus in libnm is deprecated. See * https://developer.gnome.org/libnm/stable/usage.html#sync-api diff --git a/meson.build b/meson.build index 13a5ae1648..495529ec9a 100644 --- a/meson.build +++ b/meson.build @@ -4,7 +4,7 @@ project( # - add corresponding NM_VERSION_x_y_z macros in # "shared/nm-version-macros.h.in" # - update number in configure.ac - version: '1.21.90', + version: '1.23.0', license: 'GPL2+', default_options: [ 'buildtype=debugoptimized', diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in index 961febb027..e97f506cb8 100644 --- a/shared/nm-version-macros.h.in +++ b/shared/nm-version-macros.h.in @@ -63,6 +63,7 @@ #define NM_VERSION_1_18 (NM_ENCODE_VERSION (1, 18, 0)) #define NM_VERSION_1_20 (NM_ENCODE_VERSION (1, 20, 0)) #define NM_VERSION_1_22 (NM_ENCODE_VERSION (1, 22, 0)) +#define NM_VERSION_1_24 (NM_ENCODE_VERSION (1, 24, 0)) /* For releases, NM_API_VERSION is equal to NM_VERSION. * From 9ba55ea6a63621895c2f26c12f476678b20e7619 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 18 Nov 2019 17:44:34 +0100 Subject: [PATCH 002/109] modem-broadband: avoid a crash if we fail to guess an APN Don't proceed if the context was torn down on an error in try_create_connect_properties(). [1574092292.0225] manager: NetworkManager state is now CONNECTING [1574092292.0228] modem-broadband[ttyV0]: failed to connect 'ttyV0': unable to determine the network id [1574092292.0230] device (ttyV0): state change: prepare -> failed (reason 'modem-init-failed', sys-iface-state: 'managed') [1574092292.0236] manager: NetworkManager state is now DISCONNECTED [1574092292.0250] device (ttyV0): Activation: failed for connection 'ttyV0' (NetworkManager:69212): libnm-CRITICAL **: 16:51:32.025: ((libnm-core/nm-connection.c:193)): assertion '' failed Thread 1 "NetworkManager" received signal SIGTRAP, Trace/breakpoint trap. 0x00007ffff78da6e5 in _g_log_abort () from /lib64/libglib-2.0.so.0 (gdb) bt #0 0x00007ffff78da6e5 in _g_log_abort () at /lib64/libglib-2.0.so.0 #1 0x00007ffff78db9b6 in g_logv () at /lib64/libglib-2.0.so.0 #2 0x00007ffff78dbb83 in g_log () at /lib64/libglib-2.0.so.0 #3 0x000055555563fcd2 in _nm_g_return_if_fail_warning (line=line@entry=193, file=0x5555557ae221 "libnm-core/nm-connection.c", log_domain=0x5555557ae23c "libnm") at ./shared/nm-default.h:219 #4 0x000055555563feba in _connection_get_setting_checkPython Exception No type named TypeNode.: (connection=0x0, setting_type=) at libnm-core/nm-connection.c:193 #5 _connection_get_setting_checkPython Exception No type named TypeNode.: (connection=0x0, setting_type=) at libnm-core/nm-connection.c:191 #6 0x00007fffe871f8b4 in nm_modem_get_connection_ip_type (self=self@entry=0x7fffd801c730, connection=0x0, error=error@entry=0x7fffffffc8e8) at src/devices/wwan/nm-modem.c:374 #7 0x00007fffe871bfed in connect_context_step (self=0x7fffd801c730) at src/devices/wwan/nm-modem-broadband.c:591 #8 0x00007fffe871c74b in modem_act_stage1_prepare (_self=0x7fffd801c730, connection=0x555555af5520, out_failure_reason=) at src/devices/wwan/nm-modem-broadband.c:687 #9 0x00007fffe8720203 in nm_modem_act_stage1_prepare (self=0x7fffd801c730, req=0x555555b08a30, out_failure_reason=0x7fffffffcbe0) at src/devices/wwan/nm-modem.c:1045 #10 0x0000555555705f1b in activate_stage1_device_prepare (self=0x555555a956a0) at src/devices/nm-device.c:6562 #11 0x00005555556dcbca in activation_source_handle_cb (self=0x555555a956a0, addr_family=2) at src/devices/nm-device.c:6177 #12 0x00007ffff78d0dcb in g_idle_dispatch () at /lib64/libglib-2.0.so.0 #13 0x00007ffff78d44a0 in g_main_context_dispatch () at /lib64/libglib-2.0.so.0 #14 0x00007ffff78d4830 in g_main_context_iterate.isra () at /lib64/libglib-2.0.so.0 #15 0x00007ffff78d4b23 in g_main_loop_run () at /lib64/libglib-2.0.so.0 #16 0x0000555555599ff4 in main (argc=, argv=) at src/main.c:451 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/338/ --- src/devices/wwan/nm-modem-broadband.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c index eb5b21aa7e..a1ae867128 100644 --- a/src/devices/wwan/nm-modem-broadband.c +++ b/src/devices/wwan/nm-modem-broadband.c @@ -587,6 +587,9 @@ connect_context_step (NMModemBroadband *self) if (!try_create_connect_properties (self)) break; + if (!self->_priv.ctx) + break; + /* Build up list of IP types that we need to use in the retries */ ctx->ip_types = nm_modem_get_connection_ip_type (NM_MODEM (self), ctx->connection, &error); if (!ctx->ip_types) { From 390086a3cc824aaffe61ce63162cf389513bad77 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 2 Dec 2019 09:38:57 +0100 Subject: [PATCH 003/109] build/meson: fix link failure of bluetooth's nm-bt-test $ meson . build -D bluez5_dun=true -D selinux=false -D qt=false --- src/devices/bluetooth/meson.build | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/devices/bluetooth/meson.build b/src/devices/bluetooth/meson.build index a77ad60d46..f0507c232b 100644 --- a/src/devices/bluetooth/meson.build +++ b/src/devices/bluetooth/meson.build @@ -15,11 +15,22 @@ if enable_bluez5_dun deps += bluez5_dep endif -libnm_device_plugin_bluetooth = shared_module( - 'nm-device-plugin-bluetooth', +libnm_device_plugin_bluetooth_static = static_library( + 'nm-device-plugin-bluetooth-static', sources: sources, dependencies: deps, c_args: daemon_c_flags, +) + +libnm_device_plugin_bluetooth_static_dep = declare_dependency( + link_whole: libnm_device_plugin_bluetooth_static, +) + +deps += libnm_device_plugin_bluetooth_static_dep + +libnm_device_plugin_bluetooth = shared_module( + 'nm-device-plugin-bluetooth', + dependencies: deps, link_args: ldflags_linker_script_devices, link_depends: linker_script_devices, install: true, @@ -41,7 +52,7 @@ if enable_tests executable( test_unit, 'tests/' + test_unit + '.c', - dependencies: libnetwork_manager_test_dep, + dependencies: [ libnetwork_manager_test_dep, deps ], c_args: test_c_flags, ) endif From 30f6a5dd21d4f12d72d85708406fe9a6c76ea4d4 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sat, 30 Nov 2019 13:31:39 +0100 Subject: [PATCH 004/109] contrib/rpm: explicitly enable/disable bluetooth support The bluetooth plugin (with BlueZ5/NAP support) always gets build, but DUN support requires a library. When enabling build of the bluetooth subpackage, then always enable DUN support. And enable it explicitly, especially meson would not autodetect support and disable it by default. --- contrib/fedora/rpm/NetworkManager.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 373cf0f32e..f7d07f8f2b 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -550,6 +550,11 @@ NetworkManager in cloud setups. Currently only EC2 is supported. %else -Diwd=false \ %endif +%if %{with bluetooth} + -Dbluez5_dun=true \ +%else + -Dbluez5_dun=false \ +%endif %if %{with nmtui} -Dnmtui=true \ %else @@ -676,6 +681,11 @@ intltoolize --automake --copy --force %else --with-iwd=no \ %endif +%if %{with bluetooth} + --enable-bluez5-dun=yes \ +%else + --enable-bluez5-dun=no \ +%endif %if %{with nmtui} --with-nmtui=yes \ %else From 16223cff9172e8b1ea7974af4d613406b0f56607 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 2 Dec 2019 15:22:21 +0100 Subject: [PATCH 005/109] cloud-setup: add comment that the tool is still experimental --- configure.ac | 2 +- contrib/fedora/rpm/NetworkManager.spec | 1 + meson_options.txt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 12e1663e36..70d8ff29cb 100644 --- a/configure.ac +++ b/configure.ac @@ -1015,7 +1015,7 @@ fi AM_CONDITIONAL(BUILD_NMCLI, test "$build_nmcli" = yes) AC_ARG_WITH(nm-cloud-setup, - AS_HELP_STRING([--with-nm-cloud-setup=yes|no], [Build nm-cloud-setup])) + AS_HELP_STRING([--with-nm-cloud-setup=yes|no], [Build nm-cloud-setup, a tool for automatically configure networking in cloud (EXPERIMENTAL!)])) if test "$with_nm_cloud_setup" != no; then PKG_CHECK_MODULES(LIBCURL, [libcurl >= 7.24.0], [have_libcurl=yes], [have_libcurl=no]) if test "$have_libcurl" != "yes"; then diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index f7d07f8f2b..d4a802f74c 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -493,6 +493,7 @@ Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release} %description cloud-setup Installs a nm-cloud-setup tool that can automatically configure NetworkManager in cloud setups. Currently only EC2 is supported. +This tool is still experimental. %endif diff --git a/meson_options.txt b/meson_options.txt index a01a010c0e..ffe2faa8de 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -36,7 +36,7 @@ option('teamdctl', type: 'boolean', value: false, description: 'enable Teamd con option('ovs', type: 'boolean', value: true, description: 'enable Open vSwitch support') option('nmcli', type: 'boolean', value: true, description: 'Build nmcli') option('nmtui', type: 'boolean', value: true, description: 'Build nmtui') -option('nm_cloud_setup', type: 'boolean', value: false, description: 'Build nm_cloud_setup') +option('nm_cloud_setup', type: 'boolean', value: false, description: 'Build nm-cloud-setup, a tool for automatically configure networking in cloud (EXPERIMENTAL!)') option('bluez5_dun', type: 'boolean', value: false, description: 'enable Bluez5 DUN support') option('ebpf', type: 'combo', choices : ['auto', 'true', 'false'], description: 'Enable eBPF support') From f7e3cc0b7134a28d76d428e28671ae2de8913f49 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 2 Dec 2019 17:03:34 +0100 Subject: [PATCH 006/109] platform/tests: skip team test when we fail to create team link This is necessary on Travis/Ubuntu 16.04, otherwise the test fails with # NetworkManager-MESSAGE: [1575301791.7600] platform-linux: do-add-link[nm-test-device/team]: failure 95 (Operation not supported) Aborted (core dumped) # test:ERROR:../src/platform/tests/test-link.c:353:test_software: assertion failed: (software_add (link_type, DEVICE_NAME)) ERROR: src/platform/tests/test-link-linux - too few tests run (expected 76, got 6) --- src/platform/tests/test-link.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/platform/tests/test-link.c b/src/platform/tests/test-link.c index 421a77b905..37e1cde516 100644 --- a/src/platform/tests/test-link.c +++ b/src/platform/tests/test-link.c @@ -463,9 +463,9 @@ _system (const char *cmd) static void test_bond (void) { - if (nmtstp_is_root_test () && - !g_file_test ("/proc/1/net/bonding", G_FILE_TEST_IS_DIR) && - _system("modprobe --show bonding") != 0) { + if ( nmtstp_is_root_test () + && !g_file_test ("/proc/1/net/bonding", G_FILE_TEST_IS_DIR) + && _system("modprobe --show bonding") != 0) { g_test_skip ("Skipping test for bonding: bonding module not available"); return; } @@ -476,6 +476,20 @@ test_bond (void) static void test_team (void) { + int r; + + if (nmtstp_is_root_test ()) { + r = nm_platform_link_team_add (NM_PLATFORM_GET, "nm-team-check", NULL); + + if (r < 0) { + g_assert_cmpint (r, ==, -EOPNOTSUPP); + g_test_skip ("Skipping test for teaming: team module not functioning"); + return; + } + + nmtstp_link_delete (NM_PLATFORM_GET, -1, -1, "nm-team-check", FALSE); + } + test_software (NM_LINK_TYPE_TEAM, "team"); } From 9c00eb5cb974ab165dfadd525387619a99a80dbf Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 2 Dec 2019 16:11:31 +0100 Subject: [PATCH 007/109] travis-ci: update build platform to Ubuntu 16.04 (xenial) We kept building NetworkManager in travis on an ancient Ubuntu 14.04 (trusty). However, we already cannot install latest meson, because that would require a newer python version. The used meson 1.44.1 does not support "link_whole". At this point, it's getting just too cumbersom. Update the dependencies. --- .travis.yml | 85 +++++++++++++++++++++++------------------------------ 1 file changed, 36 insertions(+), 49 deletions(-) diff --git a/.travis.yml b/.travis.yml index 139ecc11fb..57e68af9a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: c -dist: trusty +dist: xenial sudo: required compiler: - gcc @@ -9,42 +9,44 @@ addons: apt: packages: - autoconf - - libtool - - pkg-config - - intltool - - libdbus-1-dev - - libiw-dev - - libglib2.0-dev - - libmm-glib-dev - - ppp - - ppp-dev - - libpolkit-gobject-1-dev - - libgnutls-dev - - libgcrypt11-dev - - uuid-dev - - libudev-dev - - libgirepository1.0-dev - - gobject-introspection - - gtk-doc-tools - - libglib2.0-doc - - libreadline-dev - - libnewt-dev - - libnss3-dev - - iptables - - make - - python-software-properties - - python-gi - - python-dbus + - automake - dbus - dbus-x11 - - libjansson4 - - libjansson-dev - - libndp-dev - - automake - dnsmasq + - gobject-introspection + - gtk-doc-tools + - intltool + - iptables - libcurl4-gnutls-dev - - python3-pip + - libdbus-1-dev + - libgcrypt11-dev + - libgirepository1.0-dev + - libglib2.0-dev + - libglib2.0-doc + - libgnutls-dev + - libiw-dev + - libjansson-dev + - libjansson4 + - libmm-glib-dev + - libndp-dev + - libnewt-dev + - libnss3-dev + - libpolkit-gobject-1-dev + - libreadline-dev + - libteam-dev + - libtool + - libudev-dev + - make - mobile-broadband-provider-info + - pkg-config + - ppp + - ppp-dev + - python-dbus + - python-gi + - python-software-properties + - python3-pip + - python3-setuptools + - uuid-dev coverity_scan: project: name: NetworkManager/NetworkManager @@ -56,23 +58,8 @@ before_install: - sudo dbus-uuidgen --ensure - | if test "$BUILD_TYPE" == 'meson'; then - git clone https://github.com/ninja-build/ninja && - pushd ninja && - ./configure.py --bootstrap && - sudo cp ninja /usr/bin/ && - popd - - # Recent meson requires python 3.5, which isn't in Ubuntu 14.04. - # Hence we cannot install it via `pip3 install meson`. Install the latest - # working release. - # - # Wouldn't it be nice to have a build system that supports everything - # that NetworkManager would like to support? - wget https://github.com/mesonbuild/meson/releases/download/0.44.1/meson-0.44.1.tar.gz -O /tmp/meson.tar.gz - tar -C /tmp -xvzf /tmp/meson.tar.gz - pushd /tmp/meson-0.44.1 - sudo python3 setup.py install - popd + pip3 install ninja + pip3 install meson fi - sudo chmod o+x /usr/sbin/pppd - sudo locale-gen pl_PL.UTF-8 From 4fcff3f34ca61610f00cd30926d5e0d36db6271f Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Mon, 2 Dec 2019 11:29:13 +0100 Subject: [PATCH 008/109] core: remove 'legacy_unstable_byteorder' argument from client-id helpers The argument has no effect because the order only influences IAID generation. --- src/devices/nm-device.c | 3 +-- src/nm-core-utils.c | 12 +++--------- src/nm-core-utils.h | 6 ++---- src/tests/test-core.c | 3 +-- 4 files changed, 7 insertions(+), 17 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index ba7cb010b4..c4e7b80c69 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -8217,8 +8217,7 @@ dhcp4_get_client_id (NMDevice *self, if (nm_streq (client_id, "duid")) { guint32 iaid = dhcp_get_iaid (self, AF_INET, connection, NULL); - result = nm_utils_dhcp_client_id_systemd_node_specific (TRUE, - iaid); + result = nm_utils_dhcp_client_id_systemd_node_specific (iaid); goto out_good; } diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c index a5394c9e55..fb92289f0d 100644 --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c @@ -3522,9 +3522,6 @@ nm_utils_create_dhcp_iaid (gboolean legacy_unstable_byteorder, /** * nm_utils_dhcp_client_id_systemd_node_specific_full: - * @legacy_unstable_byteorder: historically, the code would generate a iaid - * dependent on host endianness. This is undesirable, if backward compatibility - * are not a concern, generate stable endianness. * @iaid: the IAID (identity association identifier) in native byte order * @machine_id: the binary identifier for the machine. It is hashed * into the DUID. It commonly is /etc/machine-id (parsed in binary as NMUuid). @@ -3537,8 +3534,7 @@ nm_utils_create_dhcp_iaid (gboolean legacy_unstable_byteorder, * Returns: a %GBytes of generated client-id. This function cannot fail. */ GBytes * -nm_utils_dhcp_client_id_systemd_node_specific_full (gboolean legacy_unstable_byteorder, - guint32 iaid, +nm_utils_dhcp_client_id_systemd_node_specific_full (guint32 iaid, const guint8 *machine_id, gsize machine_id_len) { @@ -3578,11 +3574,9 @@ nm_utils_dhcp_client_id_systemd_node_specific_full (gboolean legacy_unstable_byt } GBytes * -nm_utils_dhcp_client_id_systemd_node_specific (gboolean legacy_unstable_byteorder, - guint32 iaid) +nm_utils_dhcp_client_id_systemd_node_specific (guint32 iaid) { - return nm_utils_dhcp_client_id_systemd_node_specific_full (legacy_unstable_byteorder, - iaid, + return nm_utils_dhcp_client_id_systemd_node_specific_full (iaid, (const guint8 *) nm_utils_machine_id_bin (), sizeof (NMUuid)); } diff --git a/src/nm-core-utils.h b/src/nm-core-utils.h index a1c57d7c77..7d63d06afc 100644 --- a/src/nm-core-utils.h +++ b/src/nm-core-utils.h @@ -388,13 +388,11 @@ guint32 nm_utils_create_dhcp_iaid (gboolean legacy_unstable_byteorder, const guint8 *interface_id, gsize interface_id_len); -GBytes *nm_utils_dhcp_client_id_systemd_node_specific_full (gboolean legacy_unstable_byteorder, - guint32 iaid, +GBytes *nm_utils_dhcp_client_id_systemd_node_specific_full (guint32 iaid, const guint8 *machine_id, gsize machine_id_len); -GBytes *nm_utils_dhcp_client_id_systemd_node_specific (gboolean legacy_unstable_byteorder, - guint32 iaid); +GBytes *nm_utils_dhcp_client_id_systemd_node_specific (guint32 iaid); /*****************************************************************************/ diff --git a/src/tests/test-core.c b/src/tests/test-core.c index 2148fe7167..c6769cd8a2 100644 --- a/src/tests/test-core.c +++ b/src/tests/test-core.c @@ -2087,8 +2087,7 @@ test_nm_utils_dhcp_client_id_systemd_node_specific (gconstpointer test_data) guint32 tmp; tmp = nm_utils_create_dhcp_iaid (TRUE, (const guint8 *) d->ifname, strlen (d->ifname)); - client_id = nm_utils_dhcp_client_id_systemd_node_specific_full (legacy_unstable_byteorder, - tmp, + client_id = nm_utils_dhcp_client_id_systemd_node_specific_full (tmp, (const guint8 *) &d->machine_id, sizeof (d->machine_id)); From b90f8e785eb0a5a7f22c582767e1b88d9b30cb8e Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Mon, 2 Dec 2019 11:33:22 +0100 Subject: [PATCH 009/109] core: fix IAID endianness in client-id generation test Fixes: 6f16e524be3c ('core: support ipvX.dhcp-iaid properties') https://bugzilla.redhat.com/show_bug.cgi?id=1778640 --- src/tests/test-core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/tests/test-core.c b/src/tests/test-core.c index c6769cd8a2..f55f3dff05 100644 --- a/src/tests/test-core.c +++ b/src/tests/test-core.c @@ -2086,7 +2086,9 @@ test_nm_utils_dhcp_client_id_systemd_node_specific (gconstpointer test_data) guint32 iaid = d->iaid_ifname; guint32 tmp; - tmp = nm_utils_create_dhcp_iaid (TRUE, (const guint8 *) d->ifname, strlen (d->ifname)); + tmp = nm_utils_create_dhcp_iaid (legacy_unstable_byteorder, + (const guint8 *) d->ifname, + strlen (d->ifname)); client_id = nm_utils_dhcp_client_id_systemd_node_specific_full (tmp, (const guint8 *) &d->machine_id, sizeof (d->machine_id)); From 53db3a2da901bbcbc7e3c64e52ac7bc76324c561 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 3 Dec 2019 14:50:12 +0100 Subject: [PATCH 010/109] libnm: don't emit property changed "notify" signal while destructing NMClient It seems to trip up gnome-control-center (rh #1778668). Just don't emit anymore signals once NMClient goes down. --- libnm/nm-client.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libnm/nm-client.c b/libnm/nm-client.c index 05ccdac3fa..1a1ed25694 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -735,6 +735,14 @@ _nm_client_queue_notify_object (NMClient *self, nm_assert (NM_IS_OBJECT (nmobj) || NM_IS_CLIENT (nmobj)); base = (NMObjectBase *) nmobj; + + if (base->is_disposing) { + /* Don't emit property changed signals once the NMClient + * instance is about to shut down. */ + nm_assert (nmobj == self); + return; + } + if (c_list_is_empty (&base->queue_notify_lst)) { c_list_link_tail (&NM_CLIENT_GET_PRIVATE (self)->queue_notify_lst_head, &base->queue_notify_lst); From 667ae99f5dd673f7c2a92f6a4d9ba1e866811003 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 3 Dec 2019 08:55:28 +0100 Subject: [PATCH 011/109] cloud-setup: enable more sandboxing in systemd unit --- clients/cloud-setup/nm-cloud-setup.service.in | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/clients/cloud-setup/nm-cloud-setup.service.in b/clients/cloud-setup/nm-cloud-setup.service.in index 7d09062760..d81abea2af 100644 --- a/clients/cloud-setup/nm-cloud-setup.service.in +++ b/clients/cloud-setup/nm-cloud-setup.service.in @@ -6,3 +6,22 @@ Type=oneshot ExecStart=@libexecdir@/nm-cloud-setup #Environment=NM_CLOUD_SETUP_LOG=TRACE + +CapabilityBoundingSet= +LockPersonality=yes +MemoryDenyWriteExecute=yes +NoNewPrivileges=yes +PrivateDevices=yes +PrivateTmp=yes +ProtectControlGroups=yes +ProtectHome=yes +ProtectHostname=yes +ProtectKernelLogs=yes +ProtectKernelModules=yes +ProtectKernelTunables=yes +ProtectSystem=strict +RestrictAddressFamilies=AF_UNIX AF_NETLINK AF_INET AF_INET6 +RestrictNamespaces=yes +RestrictRealtime=yes +RestrictSUIDSGID=yes +SystemCallFilter=@system-service From 953e01336a1c062ee988d3dfe4650dd7c4ba2778 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 3 Dec 2019 10:17:11 +0100 Subject: [PATCH 012/109] cloud-setup: let dispatcher script run tool only if service is enabled We don't want that when the user installs the package, that the dispatcher script automatically executes the tool. Instead, the user should use `systemctl enable/disable` to control whether the service is active (of via the timer). Hence, let the dispatcher script check whether the service is enabled. That leads to a different problem, that we need to make it possible for "nm-cloud-setup.service" to be enabled in the first place. As such, add a [Install] section and let it be wanted by NetworkManager.service. The problem with this is that now the tool will run very early, just after NetworkManager started. At that point, it might not yet have setup networking. But that should be acceptable, after all, the tool either fails to fetch meta data that early, or it succeeds. Very likely, it will by aborted by dispatcher's restart command. --- clients/cloud-setup/90-nm-cloud-setup.sh | 4 +++- clients/cloud-setup/nm-cloud-setup.service.in | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/clients/cloud-setup/90-nm-cloud-setup.sh b/clients/cloud-setup/90-nm-cloud-setup.sh index 9fb2a31da6..817e255581 100755 --- a/clients/cloud-setup/90-nm-cloud-setup.sh +++ b/clients/cloud-setup/90-nm-cloud-setup.sh @@ -2,6 +2,8 @@ case "$2" in up|dhcp4-change) - exec systemctl --no-block restart nm-cloud-setup.service + if systemctl -q is-enabled nm-cloud-setup.service ; then + exec systemctl --no-block restart nm-cloud-setup.service + fi ;; esac diff --git a/clients/cloud-setup/nm-cloud-setup.service.in b/clients/cloud-setup/nm-cloud-setup.service.in index d81abea2af..6a6485b8cf 100644 --- a/clients/cloud-setup/nm-cloud-setup.service.in +++ b/clients/cloud-setup/nm-cloud-setup.service.in @@ -1,5 +1,6 @@ [Unit] Description=Automatically configure NetworkManager in cloud +After=NetworkManager.service [Service] Type=oneshot @@ -25,3 +26,6 @@ RestrictNamespaces=yes RestrictRealtime=yes RestrictSUIDSGID=yes SystemCallFilter=@system-service + +[Install] +WantedBy=NetworkManager.service From ff816dec17d34d996fc7dd5306945f10ed4add32 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 3 Dec 2019 10:37:42 +0100 Subject: [PATCH 013/109] cloud-setup: require to explicitly opt-in for providers via environment variable "nm-cloud-setup" is supposed to work without configuration. However, it (obviously) fetches data from the network you are connected to (which might be untrusted or controlled by somebody malicious). The tool cannot protect you against that, also because the meta data services uses HTTP and not HTTPS. It means, you should run the tool only when it's suitable for your environment, that is: in the right cloud. Usually, the user/admin/distributor would know for which cloud the enable the tool. It's also wasteful to repeatedly probe for the unavailable cloud. So, instead disable all providers by default and require to opt-in by setting an environment variable. This can be conveniently done via `systemctl edit nm-cloud-provider.service` to set Environment=. Of course, a image can also pre-deploy such am override file. --- clients/cloud-setup/nm-cloud-setup.service.in | 5 +++++ clients/cloud-setup/nmcs-provider-ec2.c | 7 ++++--- clients/cloud-setup/nmcs-provider.c | 9 +++++++++ clients/cloud-setup/nmcs-provider.h | 1 + 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/clients/cloud-setup/nm-cloud-setup.service.in b/clients/cloud-setup/nm-cloud-setup.service.in index 6a6485b8cf..69a1a29ccb 100644 --- a/clients/cloud-setup/nm-cloud-setup.service.in +++ b/clients/cloud-setup/nm-cloud-setup.service.in @@ -8,6 +8,11 @@ ExecStart=@libexecdir@/nm-cloud-setup #Environment=NM_CLOUD_SETUP_LOG=TRACE +# Cloud providers are disabled by default. You need to +# Opt-in by setting the right environment variable for +# the provider. +#Environment=NM_CLOUD_SETUP_EC2=yes + CapabilityBoundingSet= LockPersonality=yes MemoryDenyWriteExecute=yes diff --git a/clients/cloud-setup/nmcs-provider-ec2.c b/clients/cloud-setup/nmcs-provider-ec2.c index 0bdab8106f..54686fdf6e 100644 --- a/clients/cloud-setup/nmcs-provider-ec2.c +++ b/clients/cloud-setup/nmcs-provider-ec2.c @@ -545,7 +545,8 @@ nmcs_provider_ec2_class_init (NMCSProviderEC2Class *klass) { NMCSProviderClass *provider_class = NMCS_PROVIDER_CLASS (klass); - provider_class->_name = "ec2"; - provider_class->detect = detect; - provider_class->get_config = get_config; + provider_class->_name = "ec2"; + provider_class->_env_provider_enabled = "NM_CLOUD_SETUP_EC2"; + provider_class->detect = detect; + provider_class->get_config = get_config; } diff --git a/clients/cloud-setup/nmcs-provider.c b/clients/cloud-setup/nmcs-provider.c index ab1f12a4c6..1f1b6e600d 100644 --- a/clients/cloud-setup/nmcs-provider.c +++ b/clients/cloud-setup/nmcs-provider.c @@ -61,6 +61,7 @@ nmcs_provider_detect (NMCSProvider *self, gpointer user_data) { gs_unref_object GTask *task = NULL; + const char *env; g_return_if_fail (NMCS_IS_PROVIDER (self)); g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable)); @@ -69,6 +70,14 @@ nmcs_provider_detect (NMCSProvider *self, nmcs_wait_for_objects_register (task); + env = g_getenv (NMCS_PROVIDER_GET_CLASS (self)->_env_provider_enabled); + if (!_nm_utils_ascii_str_to_bool (env, FALSE)) { + g_task_return_error (task, + nm_utils_error_new (NM_UTILS_ERROR_UNKNOWN, + "provider is disabled")); + return; + } + NMCS_PROVIDER_GET_CLASS (self)->detect (self, g_steal_pointer (&task)); } diff --git a/clients/cloud-setup/nmcs-provider.h b/clients/cloud-setup/nmcs-provider.h index 930b6bd80f..e5a44da19f 100644 --- a/clients/cloud-setup/nmcs-provider.h +++ b/clients/cloud-setup/nmcs-provider.h @@ -62,6 +62,7 @@ typedef struct { typedef struct { GObjectClass parent; const char *_name; + const char *_env_provider_enabled; void (*detect) (NMCSProvider *self, GTask *task); From 7b24d6e2dcbe71272645b04657b9354612e8a8fa Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 3 Dec 2019 10:58:31 +0100 Subject: [PATCH 014/109] cloud-setup: mark environment variables that are supported configuration "nm-cloud-setup" can by configured via environment variables. Mark all the names of such variables with NMCS_ENV_VARIABLE() macro. This allows to grep for them. --- clients/cloud-setup/main.c | 2 +- clients/cloud-setup/nm-cloud-setup-utils.h | 6 ++++++ clients/cloud-setup/nmcs-provider-ec2.c | 9 ++++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/clients/cloud-setup/main.c b/clients/cloud-setup/main.c index 994a9fe0e6..8250945c47 100644 --- a/clients/cloud-setup/main.c +++ b/clients/cloud-setup/main.c @@ -594,7 +594,7 @@ main (int argc, const char *const*argv) gs_unref_object NMClient *nmc = NULL; gs_unref_hashtable GHashTable *config_dict = NULL; - _nm_logging_enabled_init (g_getenv ("NM_CLOUD_SETUP_LOG")); + _nm_logging_enabled_init (g_getenv (NMCS_ENV_VARIABLE ("NM_CLOUD_SETUP_LOG"))); _LOGD ("nm-cloud-setup %s starting...", NM_DIST_VERSION); diff --git a/clients/cloud-setup/nm-cloud-setup-utils.h b/clients/cloud-setup/nm-cloud-setup-utils.h index fa36d38985..0fc12bc47d 100644 --- a/clients/cloud-setup/nm-cloud-setup-utils.h +++ b/clients/cloud-setup/nm-cloud-setup-utils.h @@ -7,6 +7,12 @@ /*****************************************************************************/ +/* mark names for variables that can be used as configuration. Search + * for NMCS_ENV_VARIABLE() to find all honored environment variables. */ +#define NMCS_ENV_VARIABLE(var) ""var"" + +/*****************************************************************************/ + extern volatile NMLogLevel _nm_logging_configured_level; static inline gboolean diff --git a/clients/cloud-setup/nmcs-provider-ec2.c b/clients/cloud-setup/nmcs-provider-ec2.c index 54686fdf6e..b6ac5a4c95 100644 --- a/clients/cloud-setup/nmcs-provider-ec2.c +++ b/clients/cloud-setup/nmcs-provider-ec2.c @@ -24,9 +24,12 @@ _ec2_base (void) again: base = g_atomic_pointer_get (&base_cached); if (G_UNLIKELY (!base)) { + /* The base URI can be set via environment variable. - * This is only for testing, not really to be configurable! */ - base = g_getenv ("NM_CLOUD_SETUP_EC2_HOST"); + * This is mainly for testing, it's not usually supposed to be configured. + * Consider this private API! */ + base = g_getenv (NMCS_ENV_VARIABLE ("NM_CLOUD_SETUP_EC2_HOST")); + if ( base && base[0] && !strchr (base, '/')) { @@ -546,7 +549,7 @@ nmcs_provider_ec2_class_init (NMCSProviderEC2Class *klass) NMCSProviderClass *provider_class = NMCS_PROVIDER_CLASS (klass); provider_class->_name = "ec2"; - provider_class->_env_provider_enabled = "NM_CLOUD_SETUP_EC2"; + provider_class->_env_provider_enabled = NMCS_ENV_VARIABLE ("NM_CLOUD_SETUP_EC2"); provider_class->detect = detect; provider_class->get_config = get_config; } From 66ea6e01c8887cba20583270e51447d43cc7eeea Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 3 Dec 2019 16:32:08 +0100 Subject: [PATCH 015/109] libnm: drop unused _nm_dbus_proxy_call_sync() helper It's unused and: - we probably should avoid GDBusProxy altogether - we very likely should avoid blocking D-Bus calls --- libnm-core/nm-core-internal.h | 9 ------- libnm-core/nm-dbus-utils.c | 46 ----------------------------------- 2 files changed, 55 deletions(-) diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index b7222df20a..1e5ee63790 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -389,15 +389,6 @@ GVariant *_nm_dbus_proxy_call_finish (GDBusProxy *proxy, const GVariantType *reply_type, GError **error); -GVariant *_nm_dbus_proxy_call_sync (GDBusProxy *proxy, - const char *method_name, - GVariant *parameters, - const GVariantType *reply_type, - GDBusCallFlags flags, - int timeout_msec, - GCancellable *cancellable, - GError **error); - GVariant * _nm_dbus_connection_call_finish (GDBusConnection *dbus_connection, GAsyncResult *result, const GVariantType *reply_type, diff --git a/libnm-core/nm-dbus-utils.c b/libnm-core/nm-dbus-utils.c index 8309294800..72b9fe1f44 100644 --- a/libnm-core/nm-dbus-utils.c +++ b/libnm-core/nm-dbus-utils.c @@ -221,52 +221,6 @@ _nm_dbus_proxy_call_finish (GDBusProxy *proxy, return variant; } -/** - * _nm_dbus_proxy_call_sync: - * @proxy: A #GDBusProxy. - * @method_name: Name of method to invoke. - * @parameters: (allow-none): A #GVariant tuple with parameters for the signal - * or %NULL if not passing parameters. - * @reply_type: (allow-none): the expected type of the reply, or %NULL - * @flags: Flags from the #GDBusCallFlags enumeration. - * @timeout_msec: The timeout in milliseconds (with %G_MAXINT meaning - * "infinite") or -1 to use the proxy default timeout. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the @method_name method on @proxy, as with - * g_dbus_proxy_call_sync(), except that if @reply_type is non-%NULL, then the - * reply to the call will be checked against it, and an error returned if it - * does not match. - * - * Returns: %NULL if @error is set. Otherwise a #GVariant tuple with - * return values. Free with g_variant_unref(). - */ -GVariant * -_nm_dbus_proxy_call_sync (GDBusProxy *proxy, - const char *method_name, - GVariant *parameters, - const GVariantType *reply_type, - GDBusCallFlags flags, - int timeout_msec, - GCancellable *cancellable, - GError **error) -{ - GVariant *variant; - - variant = g_dbus_proxy_call_sync (proxy, - method_name, - parameters, - flags, - timeout_msec, - cancellable, - error); - if ( variant - && !_nm_dbus_typecheck_response (variant, reply_type, error)) - nm_clear_pointer (&variant, g_variant_unref); - return variant; -} - GVariant * _nm_dbus_connection_call_finish (GDBusConnection *dbus_connection, GAsyncResult *result, From c15682558cdedac404f97ea74ebf53317d9f1681 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 4 Dec 2019 13:03:32 +0100 Subject: [PATCH 016/109] gitlab-ci: fix generating "pages" after switching to Fedora 30 for main build --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c9e93429a6..6394e3a377 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -181,7 +181,7 @@ t_debian:sid: pages: stage: deploy dependencies: - - t_fedora:29 + - t_fedora:30 script: - mv docs-html public artifacts: From ea4e95ec33a284fa03ed360b0101a02dcd22294d Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 4 Dec 2019 18:25:39 +0100 Subject: [PATCH 017/109] initrd: generate IPv6 profiles with ipv6.addr-gen-mode=eui64 https://bugzilla.redhat.com/show_bug.cgi?id=1779389 --- src/initrd/nmi-cmdline-reader.c | 1 + src/initrd/nmi-dt-reader.c | 4 ++++ src/initrd/nmi-ibft-reader.c | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/src/initrd/nmi-cmdline-reader.c b/src/initrd/nmi-cmdline-reader.c index c7a01aaea1..c32ef1cfea 100644 --- a/src/initrd/nmi-cmdline-reader.c +++ b/src/initrd/nmi-cmdline-reader.c @@ -59,6 +59,7 @@ add_conn (GHashTable *connections, g_object_set (setting, NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO, NM_SETTING_IP_CONFIG_MAY_FAIL, TRUE, + NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE, (int) NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64, NULL); setting = nm_setting_connection_new (); diff --git a/src/initrd/nmi-dt-reader.c b/src/initrd/nmi-dt-reader.c index 612760de89..d2e571d7a8 100644 --- a/src/initrd/nmi-dt-reader.c +++ b/src/initrd/nmi-dt-reader.c @@ -290,6 +290,10 @@ nmi_dt_reader_parse (const char *sysfs_dir) s_ip6 = nm_setting_ip6_config_new (); nm_connection_add_setting (connection, s_ip6); + g_object_set (s_ip6, + NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE, (int) NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64, + NULL); + if (!bootp && dt_get_property (base, "chosen", "bootp-response", NULL, NULL)) bootp = TRUE; diff --git a/src/initrd/nmi-ibft-reader.c b/src/initrd/nmi-ibft-reader.c index 80961c19a6..ffce98fc40 100644 --- a/src/initrd/nmi-ibft-reader.c +++ b/src/initrd/nmi-ibft-reader.c @@ -157,6 +157,10 @@ ip_setting_add_from_block (GHashTable *nic, if (!s_ip6) { s_ip6 = (NMSettingIPConfig *) nm_setting_ip6_config_new (); nm_connection_add_setting (connection, (NMSetting *) s_ip6); + + g_object_set (s_ip6, + NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE, (int) NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64, + NULL); } family = guess_ip_address_family (s_ipaddr); From 15fb8fe26deb8bee99b06662d7624adc06f8d162 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 5 Dec 2019 12:27:13 +0100 Subject: [PATCH 018/109] settings/trivial: add fixme comment for creating GDBusConnection for ifcfg D-Bus interface We really should just use the one and only main connection. --- src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c index f57ca1a7b2..453307ad85 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c @@ -1132,6 +1132,8 @@ _dbus_setup (NMSIfcfgRHPlugin *self) _dbus_clear (self); + /* FIXME: we don't need a separate GDBusConnection. Just reuse the one from + * nm_dbus_manager_get_dbus_connection(). */ address = g_dbus_address_get_for_bus_sync (G_BUS_TYPE_SYSTEM, NULL, &error); if (address == NULL) { _LOGW ("dbus: failed getting address for system bus: %s", error->message); From 06a976358b5946a5def73cb2532e2da666209432 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 3 Sep 2019 13:17:28 +0200 Subject: [PATCH 019/109] shared: add nm_utils_addr_family_from_size() helper --- shared/nm-glib-aux/nm-shared-utils.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/shared/nm-glib-aux/nm-shared-utils.h index bbbb9b64be..4abd2a004d 100644 --- a/shared/nm-glib-aux/nm-shared-utils.h +++ b/shared/nm-glib-aux/nm-shared-utils.h @@ -89,6 +89,16 @@ nm_utils_addr_family_to_size (int addr_family) g_return_val_if_reached (0); } +static inline int +nm_utils_addr_family_from_size (gsize len) +{ + switch (len) { + case sizeof (in_addr_t): return AF_INET; + case sizeof (struct in6_addr): return AF_INET6; + } + return AF_UNSPEC; +} + #define nm_assert_addr_family(addr_family) \ nm_assert (NM_IN_SET ((addr_family), AF_INET, AF_INET6)) From 8fbf67d13826f73be75fa301d8bd27f4dba8b52c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 3 Sep 2019 13:49:47 +0200 Subject: [PATCH 020/109] shared: add nm_utils_parse_inaddr_bin_full() to support legacy IPv4 formats as inet_aton() inet_aton() also supports IPv4 addresses in octal (with a leading '0') or where not all 4 digits of the address are present. Add nm_utils_parse_inaddr_bin_full() to optionally fallback to parse the address with inet_aton(). Note taht inet_aton() also supports all crazy formats, including ignoring trailing garbage after a whitespace. We don't want to accept that in general. Note that even in legacy format we: - accept everything that inet_pton() would accept - additionally, we also accept some forms which inet_aton() would accept, but not all. That means, the legacy format that we accept is a superset of inet_pton() and a subset of inet_aton(). Which is desirable. --- shared/nm-glib-aux/nm-shared-utils.c | 99 ++++++++++++++++++++++++++-- shared/nm-glib-aux/nm-shared-utils.h | 17 +++-- 2 files changed, 106 insertions(+), 10 deletions(-) diff --git a/shared/nm-glib-aux/nm-shared-utils.c b/shared/nm-glib-aux/nm-shared-utils.c index be9fbdc4ae..8e1c8b5806 100644 --- a/shared/nm-glib-aux/nm-shared-utils.c +++ b/shared/nm-glib-aux/nm-shared-utils.c @@ -683,11 +683,80 @@ nm_utils_ip_is_site_local (int addr_family, /*****************************************************************************/ +static gboolean +_parse_legacy_addr4 (const char *text, in_addr_t *out_addr) +{ + gs_free char *s_free = NULL; + struct in_addr a1; + guint8 bin[sizeof (a1)]; + char *s; + int i; + + if (inet_aton (text, &a1) != 1) + return FALSE; + + /* OK, inet_aton() accepted the format. That's good, because we want + * to accept IPv4 addresses in octal format, like 255.255.000.000. + * That's what "legacy" means here. inet_pton() doesn't accept those. + * + * But inet_aton() also ignores trailing garbage and formats with fewer than + * 4 digits. That is just too crazy and we don't do that. Perform additional checks + * and reject some forms that inet_aton() accepted. + * + * Note that we still should (of course) accept everything that inet_pton() + * accepts. However this code never gets called if inet_pton() succeeds + * (see below, aside the assertion code). */ + + if (NM_STRCHAR_ANY (text, ch, ( !(ch >= '0' && ch <= '9') + && !NM_IN_SET (ch, '.', 'x')))) { + /* We only accepts '.', digits, and 'x' for "0x". */ + return FALSE; + } + + s = nm_memdup_maybe_a (300, text, strlen (text) + 1, &s_free); + + for (i = 0; i < G_N_ELEMENTS (bin); i++) { + char *current_token = s; + gint32 v; + + s = strchr (s, '.'); + if (s) { + s[0] = '\0'; + s++; + } + + if ((i == G_N_ELEMENTS (bin) - 1) != (s == NULL)) { + /* Exactly for the last digit, we expect to have no more following token. + * But this isn't the case. Abort. */ + return FALSE; + } + + v = _nm_utils_ascii_str_to_int64 (current_token, 0, 0, 0xFF, -1); + if (v == -1) { + /* we do accept octal and hex (even with leading "0x"). But something + * about this token is wrong. */ + return FALSE; + } + + bin[i] = v; + } + + if (memcmp (bin, &a1, sizeof (bin)) != 0) { + /* our parsing did not agree with what inet_aton() gave. Something + * is wrong. Abort. */ + return FALSE; + } + + *out_addr = a1.s_addr; + return TRUE; +} + gboolean -nm_utils_parse_inaddr_bin (int addr_family, - const char *text, - int *out_addr_family, - gpointer out_addr) +nm_utils_parse_inaddr_bin_full (int addr_family, + gboolean accept_legacy, + const char *text, + int *out_addr_family, + gpointer out_addr) { NMIPAddr addrbin; @@ -699,8 +768,26 @@ nm_utils_parse_inaddr_bin (int addr_family, } else g_return_val_if_fail (NM_IN_SET (addr_family, AF_INET, AF_INET6), FALSE); - if (inet_pton (addr_family, text, &addrbin) != 1) - return FALSE; + if (inet_pton (addr_family, text, &addrbin) != 1) { + if ( accept_legacy + && addr_family == AF_INET + && _parse_legacy_addr4 (text, &addrbin.addr4)) { + /* The address is in some legacy format which inet_aton() accepts, but not inet_pton(). + * Most likely octal digits (leading zeros). We accept the address. */ + } else + return FALSE; + } + +#if NM_MORE_ASSERTS > 10 + if (addr_family == AF_INET) { + in_addr_t a; + + /* The legacy parser should accept everything that inet_pton() accepts too. Meaning, + * it should strictly parse *more* formats. And of course, parse it the same way. */ + nm_assert (_parse_legacy_addr4 (text, &a)); + nm_assert (addrbin.addr4 == a); + } +#endif NM_SET_OUT (out_addr_family, addr_family); if (out_addr) diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/shared/nm-glib-aux/nm-shared-utils.h index 4abd2a004d..3bd1afaea3 100644 --- a/shared/nm-glib-aux/nm-shared-utils.h +++ b/shared/nm-glib-aux/nm-shared-utils.h @@ -542,10 +542,19 @@ gboolean nm_utils_ip_is_site_local (int addr_family, /*****************************************************************************/ -gboolean nm_utils_parse_inaddr_bin (int addr_family, - const char *text, - int *out_addr_family, - gpointer out_addr); +gboolean nm_utils_parse_inaddr_bin_full (int addr_family, + gboolean accept_legacy, + const char *text, + int *out_addr_family, + gpointer out_addr); +static inline gboolean +nm_utils_parse_inaddr_bin (int addr_family, + const char *text, + int *out_addr_family, + gpointer out_addr) +{ + return nm_utils_parse_inaddr_bin_full (addr_family, FALSE, text, out_addr_family, out_addr); +} gboolean nm_utils_parse_inaddr (int addr_family, const char *text, From 321a323df4ad5340eff843ceae1ffee2e8930066 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 3 Oct 2019 11:22:48 +0200 Subject: [PATCH 021/109] initrd: fix use-after-free for variable "s_gateway" in nmi_dt_reader_parse() --- src/initrd/nmi-dt-reader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/initrd/nmi-dt-reader.c b/src/initrd/nmi-dt-reader.c index d2e571d7a8..140ef12578 100644 --- a/src/initrd/nmi-dt-reader.c +++ b/src/initrd/nmi-dt-reader.c @@ -329,8 +329,6 @@ nmi_dt_reader_parse (const char *sysfs_dir) if (netmask) nm_ip_address_unref (netmask); - if (gateway) - nm_ip_address_unref (gateway); } if (!ipaddr) { @@ -377,6 +375,8 @@ nmi_dt_reader_parse (const char *sysfs_dir) if (ipaddr) nm_ip_address_unref (ipaddr); + if (gateway) + nm_ip_address_unref (gateway); if (duplex || speed || hwaddr || local_hwaddr) { s_wired = nm_setting_wired_new (); From e7cf22be3ed1e2f0a403a7809e2f791cb01af404 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sat, 21 Sep 2019 15:20:24 +0200 Subject: [PATCH 022/109] initrd: use cleanup attribute in nmi_dt_reader_parse() --- src/initrd/nmi-dt-reader.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/src/initrd/nmi-dt-reader.c b/src/initrd/nmi-dt-reader.c index 140ef12578..3290689d9c 100644 --- a/src/initrd/nmi-dt-reader.c +++ b/src/initrd/nmi-dt-reader.c @@ -135,7 +135,7 @@ str_addr (const char *str, int *family) NMConnection * nmi_dt_reader_parse (const char *sysfs_dir) { - NMConnection *connection; + gs_unref_object NMConnection *connection = NULL; gs_free char *base = NULL; gs_free char *bootpath = NULL; gs_strfreev char **tokens = NULL; @@ -144,9 +144,8 @@ nmi_dt_reader_parse (const char *sysfs_dir) const char *s_ipaddr = NULL; const char *s_netmask = NULL; const char *s_gateway = NULL; - NMIPAddress *ipaddr = NULL; - NMIPAddress *netmask = NULL; - NMIPAddress *gateway = NULL; + nm_auto_unref_ip_address NMIPAddress *ipaddr = NULL; + nm_auto_unref_ip_address NMIPAddress *gateway = NULL; const char *duplex = NULL; gs_free char *hwaddr = NULL; gs_free char *local_hwaddr = NULL; @@ -279,10 +278,10 @@ nmi_dt_reader_parse (const char *sysfs_dir) connection = nm_simple_connection_new (); nm_connection_add_setting (connection, - g_object_new (NM_TYPE_SETTING_CONNECTION, - NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME, - NM_SETTING_CONNECTION_ID, "OpenFirmware Connection", - NULL)); + g_object_new (NM_TYPE_SETTING_CONNECTION, + NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME, + NM_SETTING_CONNECTION_ID, "OpenFirmware Connection", + NULL)); s_ip4 = nm_setting_ip4_config_new (); nm_connection_add_setting (connection, s_ip4); @@ -298,6 +297,8 @@ nmi_dt_reader_parse (const char *sysfs_dir) bootp = TRUE; if (!bootp) { + nm_auto_unref_ip_address NMIPAddress *netmask = NULL; + netmask = dt_get_ipaddr_property (base, "chosen", "netmask-ip", &family); gateway = dt_get_ipaddr_property (base, "chosen", "gateway-ip", &family); if (gateway) @@ -305,9 +306,9 @@ nmi_dt_reader_parse (const char *sysfs_dir) ipaddr = dt_get_ipaddr_property (base, "chosen", "client-ip", &family); if (family == AF_UNSPEC) { - g_warn_if_fail (netmask == NULL); - g_warn_if_fail (ipaddr == NULL); - g_warn_if_fail (gateway == NULL); + nm_assert (netmask == NULL); + nm_assert (gateway == NULL); + nm_assert (ipaddr == NULL); netmask = str_addr (s_netmask, &family); ipaddr = str_addr (s_ipaddr, &family); @@ -326,9 +327,6 @@ nmi_dt_reader_parse (const char *sysfs_dir) _LOGW (LOGD_CORE, "Unable to determine the network prefix"); else nm_ip_address_set_prefix (ipaddr, prefix); - - if (netmask) - nm_ip_address_unref (netmask); } if (!ipaddr) { @@ -373,11 +371,6 @@ nmi_dt_reader_parse (const char *sysfs_dir) g_object_set (s_ip, NM_SETTING_IP_CONFIG_GATEWAY, s_gateway, NULL); } - if (ipaddr) - nm_ip_address_unref (ipaddr); - if (gateway) - nm_ip_address_unref (gateway); - if (duplex || speed || hwaddr || local_hwaddr) { s_wired = nm_setting_wired_new (); nm_connection_add_setting (connection, s_wired); @@ -390,11 +383,11 @@ nmi_dt_reader_parse (const char *sysfs_dir) NULL); } - if (!nm_connection_normalize (connection, NULL, NULL, &error)) { + if (!nm_connection_normalize (connection, NULL, NULL, &error)) { _LOGW (LOGD_CORE, "Generated an invalid connection: %s", error->message); g_clear_pointer (&connection, g_object_unref); } - return connection; + return g_steal_pointer (&connection); } From 9618f1bb4b5e16f95c7d19556356b990486966b7 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sat, 21 Sep 2019 15:27:49 +0200 Subject: [PATCH 023/109] initrd: fix out-of-bounds read when detecting address family in dt_get_ipaddr_property() The @family argument is an input and output argument. Initially, the family is set to AF_UNSPEC, in which case the family gets detected based on the IP address. However, we call dt_get_ipaddr_property() multiple times to parse the netmask, the gateway and the IP address. That means, after the first successfull call, the @family is set to AF_INET or AF_INET6. Note that the previous code (in the switch block) would only check that the family is set to AF_UNSPEC, but it would not check that the @family matches the expected binary address length @len. Later, we then might call nm_ip_address_new_binary() with a family and a binary address of unexpected length. Also drop the error checking for nm_ip_address_new_binary(). nm_ip_address_new_binary() can only fail if the prefix length is larger than 32/128. The function has no way to validate the input arguments beyond that and can thus not fail (short of undefined behavior). --- src/initrd/nmi-dt-reader.c | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/src/initrd/nmi-dt-reader.c b/src/initrd/nmi-dt-reader.c index 3290689d9c..bc574395fc 100644 --- a/src/initrd/nmi-dt-reader.c +++ b/src/initrd/nmi-dt-reader.c @@ -51,40 +51,24 @@ dt_get_ipaddr_property (const char *base, const char *prop, int *family) { - NMIPAddress *addr; gs_free char *buf = NULL; size_t len; - gs_free_error GError *error = NULL; + int f; if (!dt_get_property (base, dev, prop, &buf, &len)) return NULL; - switch (len) { - case 4: - if (*family == AF_UNSPEC) - *family = AF_INET; - break; - case 16: - if (*family == AF_UNSPEC) - *family = AF_INET6; - break; - default: - break; - } - - if (*family == AF_UNSPEC) { + f = nm_utils_addr_family_from_size (len); + if ( f == AF_UNSPEC + || ( *family != AF_UNSPEC + && *family != f)) { _LOGW (LOGD_CORE, "%s: Address %s has unrecognized length (%zd)", dev, prop, len); return NULL; } - addr = nm_ip_address_new_binary (*family, buf, 0, &error); - if (!addr) { - _LOGW (LOGD_CORE, "%s: Address %s is malformed: %s", - dev, prop, error->message); - } - - return addr; + *family = f; + return nm_ip_address_new_binary (f, buf, 0, NULL); } static char * From d68373c305fcb6ffb5a7c60a081db9b0f2832de1 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sat, 21 Sep 2019 15:39:19 +0200 Subject: [PATCH 024/109] initrd: don't use inet_aton() to parse IPv4 address inet_aton() is very accepting when parsing the address. For example, it accepts addresses with fewer octets (interpreting the last octet as a number in network byte order for multiple bytes). It also ignores any trailing garbage after the first delimiting whitespace (at least, the glibc implementation). It also accepts octets in hex and octal notation. For the initrd reader we want to be more forgiving than inet_pton() and also accept addresses like 255.000.000.000 (octal notation). For that we would want to use inet_aton(). But we should not accept all the craziness that inet_aton() otherwise accepts. Use nm_utils_parse_inaddr_bin_full() instead. This function implements our way how we want to interpret IP addresses in string representation. Under the hood, of course it also uses inet_pton() and even inet_aton(), but it is stricter than inet_aton() and only accepts certain formats. --- src/initrd/nmi-dt-reader.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/initrd/nmi-dt-reader.c b/src/initrd/nmi-dt-reader.c index bc574395fc..a8677ed9c3 100644 --- a/src/initrd/nmi-dt-reader.c +++ b/src/initrd/nmi-dt-reader.c @@ -96,24 +96,17 @@ dt_get_hwaddr_property (const char *base, static NMIPAddress * str_addr (const char *str, int *family) { - struct in_addr inp; + NMIPAddr addr_bin; - if (*family == AF_UNSPEC) - *family = guess_ip_address_family (str); - - if (*family == AF_UNSPEC) { + if (!nm_utils_parse_inaddr_bin_full (*family, + TRUE, + str, + family, + &addr_bin)) { _LOGW (LOGD_CORE, "Malformed IP address: '%s'", str); return NULL; } - - if (*family == AF_INET && inet_aton (str, &inp)) { - /* For IPv4, we need to be more tolerant than - * nm_ip_address_new(), to recognize things like - * the extra zeroes in "255.255.255.000" */ - return nm_ip_address_new_binary (*family, &inp, 0, NULL); - } - - return nm_ip_address_new (*family, str, 0, NULL); + return nm_ip_address_new_binary (*family, &addr_bin, 0, NULL); } NMConnection * From ba299d0d0c89eb1ae3996f98a0b23ebc8cf010a1 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 17 Nov 2019 22:15:38 +0100 Subject: [PATCH 025/109] libnm-core: add OWE support flag --- libnm-core/nm-dbus-interface.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h index 35f2335f56..6f7bf4c95f 100644 --- a/libnm-core/nm-dbus-interface.h +++ b/libnm-core/nm-dbus-interface.h @@ -342,6 +342,8 @@ typedef enum { /*< underscore_name=nm_802_11_ap_flags, flags >*/ * is supported * @NM_802_11_AP_SEC_KEY_MGMT_SAE: WPA/RSN Simultaneous Authentication of Equals is * supported + * @NM_802_11_AP_SEC_KEY_MGMT_OWE: WPA/RSN Opportunistic Wireless Encryption is + * supported * * 802.11 access point security and authentication flags. These flags describe * the current security requirements of an access point as determined from the @@ -360,6 +362,7 @@ typedef enum { /*< underscore_name=nm_802_11_ap_security_flags, flags >*/ NM_802_11_AP_SEC_KEY_MGMT_PSK = 0x00000100, NM_802_11_AP_SEC_KEY_MGMT_802_1X = 0x00000200, NM_802_11_AP_SEC_KEY_MGMT_SAE = 0x00000400, + NM_802_11_AP_SEC_KEY_MGMT_OWE = 0x00000800, } NM80211ApSecurityFlags; /** From 1bae844facb34fb14e8ec57318854af1fdcfc79f Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 17 Nov 2019 22:16:33 +0100 Subject: [PATCH 026/109] wifi/ap: expose OWE capability --- src/devices/wifi/nm-wifi-ap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/devices/wifi/nm-wifi-ap.c b/src/devices/wifi/nm-wifi-ap.c index ee7dc2360e..b4e07ff9be 100644 --- a/src/devices/wifi/nm-wifi-ap.c +++ b/src/devices/wifi/nm-wifi-ap.c @@ -422,6 +422,8 @@ security_from_vardict (GVariant *security) flags |= NM_802_11_AP_SEC_KEY_MGMT_802_1X; if (g_strv_contains (array, "sae")) flags |= NM_802_11_AP_SEC_KEY_MGMT_SAE; + if (g_strv_contains (array, "owe")) + flags |= NM_802_11_AP_SEC_KEY_MGMT_OWE; g_free (array); } @@ -1394,7 +1396,8 @@ nm_wifi_ap_class_init (NMWifiAPClass *ap_class) | NM_802_11_AP_SEC_GROUP_CCMP \ | NM_802_11_AP_SEC_KEY_MGMT_PSK \ | NM_802_11_AP_SEC_KEY_MGMT_802_1X \ - | NM_802_11_AP_SEC_KEY_MGMT_SAE ) + | NM_802_11_AP_SEC_KEY_MGMT_SAE \ + | NM_802_11_AP_SEC_KEY_MGMT_OWE ) GObjectClass *object_class = G_OBJECT_CLASS (ap_class); NMDBusObjectClass *dbus_object_class = NM_DBUS_OBJECT_CLASS (ap_class); From 85c4a757ada39ccbd705ab76723511716d41aa0e Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 17 Nov 2019 22:17:56 +0100 Subject: [PATCH 027/109] libnm-core/setting-wireless-security: add support for OWE key-management --- clients/common/settings-docs.h.in | 2 +- libnm-core/nm-setting-wireless-security.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in index f696ca826c..616b0c15d4 100644 --- a/clients/common/settings-docs.h.in +++ b/clients/common/settings-docs.h.in @@ -24,7 +24,7 @@ #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_AUTH_ALG N_("When WEP is used (ie, key-mgmt = \"none\" or \"ieee8021x\") indicate the 802.11 authentication algorithm required by the AP here. One of \"open\" for Open System, \"shared\" for Shared Key, or \"leap\" for Cisco LEAP. When using Cisco LEAP (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\") the \"leap-username\" and \"leap-password\" properties must be specified.") #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_FILS N_("Indicates whether Fast Initial Link Setup (802.11ai) must be enabled for the connection. One of NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (use global default value), NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE (1) (disable FILS), NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (2) (enable FILS if the supplicant and the access point support it) or NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (enable FILS and fail if not supported). When set to NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) and no global default is set, FILS will be optionally enabled.") #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_GROUP N_("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. For maximum compatibility leave this property empty. Each list element may be one of \"wep40\", \"wep104\", \"tkip\", or \"ccmp\".") -#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_KEY_MGMT N_("Key management used for the connection. One of \"none\" (WEP), \"ieee8021x\" (Dynamic WEP), \"wpa-psk\" (infrastructure WPA-PSK), \"sae\" (SAE) or \"wpa-eap\" (WPA-Enterprise). This property must be set for any Wi-Fi connection that uses security.") +#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_KEY_MGMT N_("Key management used for the connection. One of \"none\" (WEP), \"ieee8021x\" (Dynamic WEP), \"wpa-psk\" (infrastructure WPA-PSK), \"sae\" (SAE), \"owe\" (Opportunistic Wireless Encryption) or \"wpa-eap\" (WPA-Enterprise). This property must be set for any Wi-Fi connection that uses security.") #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD N_("The login password for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\").") #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS N_("Flags indicating how to handle the \"leap-password\" property.") #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME N_("The login username for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\").") diff --git a/libnm-core/nm-setting-wireless-security.c b/libnm-core/nm-setting-wireless-security.c index a634546ded..b0b96f9957 100644 --- a/libnm-core/nm-setting-wireless-security.c +++ b/libnm-core/nm-setting-wireless-security.c @@ -865,7 +865,8 @@ need_secrets (NMSetting *setting) } if ( (strcmp (priv->key_mgmt, "ieee8021x") == 0) - || (strcmp (priv->key_mgmt, "wpa-eap") == 0)) { + || (strcmp (priv->key_mgmt, "wpa-eap") == 0) + || (strcmp (priv->key_mgmt, "owe") == 0)) { /* Let caller check the 802.1x setting for secrets */ goto no_secrets; } @@ -884,7 +885,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) { NMSettingWirelessSecurity *self = NM_SETTING_WIRELESS_SECURITY (setting); NMSettingWirelessSecurityPrivate *priv = NM_SETTING_WIRELESS_SECURITY_GET_PRIVATE (self); - const char *valid_key_mgmt[] = { "none", "ieee8021x", "wpa-psk", "wpa-eap", "sae", NULL }; + const char *valid_key_mgmt[] = { "none", "ieee8021x", "wpa-psk", "wpa-eap", "sae", "owe", NULL }; const char *valid_auth_algs[] = { "open", "shared", "leap", NULL }; const char *valid_protos[] = { "wpa", "rsn", NULL }; const char *valid_pairwise[] = { "tkip", "ccmp", NULL }; @@ -1054,7 +1055,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) if ( NM_IN_SET (priv->pmf, NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL, NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED) - && !NM_IN_STRSET (priv->key_mgmt, "wpa-eap", "wpa-psk", "sae")) { + && !NM_IN_STRSET (priv->key_mgmt, "wpa-eap", "wpa-psk", "sae", "owe")) { g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, @@ -1429,7 +1430,8 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass) * * Key management used for the connection. One of "none" (WEP), * "ieee8021x" (Dynamic WEP), "wpa-psk" (infrastructure WPA-PSK), "sae" - * (SAE) or "wpa-eap" (WPA-Enterprise). This property must be set for + * (SAE), "owe" (Opportunistic Wireless Encryption) or "wpa-eap" + * (WPA-Enterprise). This property must be set for * any Wi-Fi connection that uses security. **/ /* ---ifcfg-rh--- From 1e55eff49872d65a75b4923c2fb4d13a5f2d9bd4 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 17 Nov 2019 22:19:44 +0100 Subject: [PATCH 028/109] supplicant: add support for OWE key management --- src/supplicant/nm-supplicant-config.c | 7 ++++--- src/supplicant/nm-supplicant-settings-verify.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/supplicant/nm-supplicant-config.c b/src/supplicant/nm-supplicant-config.c index dec4556d1c..8b9c0ceb40 100644 --- a/src/supplicant/nm-supplicant-config.c +++ b/src/supplicant/nm-supplicant-config.c @@ -867,8 +867,8 @@ nm_supplicant_config_add_setting_wireless_security (NMSupplicantConfig *self, } } - /* Don't try to enable PMF on non-WPA/SAE networks */ - if (!NM_IN_STRSET (key_mgmt, "wpa-eap", "wpa-psk", "sae")) + /* Don't try to enable PMF on non-WPA/SAE/OWE networks */ + if (!NM_IN_STRSET (key_mgmt, "wpa-eap", "wpa-psk", "sae", "owe")) pmf = NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE; /* Check if we actually support PMF */ @@ -885,7 +885,8 @@ nm_supplicant_config_add_setting_wireless_security (NMSupplicantConfig *self, /* Only WPA-specific things when using WPA */ if ( !strcmp (key_mgmt, "wpa-psk") || !strcmp (key_mgmt, "wpa-eap") - || !strcmp (key_mgmt, "sae")) { + || !strcmp (key_mgmt, "sae") + || !strcmp (key_mgmt, "owe")) { if (!ADD_STRING_LIST_VAL (self, setting, wireless_security, proto, protos, "proto", ' ', TRUE, NULL, error)) return FALSE; if (!ADD_STRING_LIST_VAL (self, setting, wireless_security, pairwise, pairwise, "pairwise", ' ', TRUE, NULL, error)) diff --git a/src/supplicant/nm-supplicant-settings-verify.c b/src/supplicant/nm-supplicant-settings-verify.c index bea17ede24..20287b8ca6 100644 --- a/src/supplicant/nm-supplicant-settings-verify.c +++ b/src/supplicant/nm-supplicant-settings-verify.c @@ -56,7 +56,7 @@ static const char *const key_mgmt_allowed[] = { "WPA-PSK", "WPA-PSK-SHA256", "FT "WPA-EAP", "WPA-EAP-SHA256", "FT-EAP", "FT-EAP-SHA384", "FILS-SHA256", "FILS-SHA384", "IEEE8021X", "SAE", "FT-SAE", - "NONE", NULL }; + "OWE", "NONE", NULL }; static const char *const auth_alg_allowed[] = { "OPEN", "SHARED", "LEAP", NULL }; static const char *const eap_allowed[] = { "LEAP", "MD5", "TLS", "PEAP", "TTLS", "SIM", "PSK", "FAST", "PWD", NULL }; From 235cb4a5d310e207d4751c651d3e672481aa30dd Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 17 Nov 2019 22:20:56 +0100 Subject: [PATCH 029/109] settings/ifcfg: add support for KEY_MGMT=OWE --- Makefile.am | 1 + .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 25 +++++++----- .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 4 ++ .../tests/network-scripts/ifcfg-test-wifi-owe | 5 +++ .../plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 40 +++++++++++++++++++ 5 files changed, 65 insertions(+), 10 deletions(-) create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe diff --git a/Makefile.am b/Makefile.am index 089af41726..ecacf568e6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3073,6 +3073,7 @@ EXTRA_DIST += \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-sae \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii \ diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c index a1d3236e9b..8fc72822de 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c @@ -3643,7 +3643,7 @@ make_wpa_setting (shvarFile *ifcfg, gs_unref_object NMSettingWirelessSecurity *wsec = NULL; gs_free char *value = NULL; const char *v; - gboolean wpa_psk = FALSE, wpa_sae = FALSE, wpa_eap = FALSE, ieee8021x = FALSE; + gboolean wpa_psk = FALSE, wpa_sae = FALSE, wpa_owe = FALSE, wpa_eap = FALSE, ieee8021x = FALSE; int i_val; GError *local = NULL; @@ -3652,10 +3652,12 @@ make_wpa_setting (shvarFile *ifcfg, v = svGetValueStr (ifcfg, "KEY_MGMT", &value); wpa_psk = nm_streq0 (v, "WPA-PSK"); wpa_sae = nm_streq0 (v, "SAE"); + wpa_owe = nm_streq0 (v, "OWE"); wpa_eap = nm_streq0 (v, "WPA-EAP"); ieee8021x = nm_streq0 (v, "IEEE8021X"); if ( !wpa_psk && !wpa_sae + && !wpa_owe && !wpa_eap && !ieee8021x) return NULL; /* Not WPA or Dynamic WEP */ @@ -3671,7 +3673,7 @@ make_wpa_setting (shvarFile *ifcfg, NULL); /* Pairwise and Group ciphers (only relevant for WPA/RSN) */ - if (wpa_psk || wpa_sae || wpa_eap) { + if (wpa_psk || wpa_sae || wpa_owe || wpa_eap) { fill_wpa_ciphers (ifcfg, wsec, FALSE, adhoc); fill_wpa_ciphers (ifcfg, wsec, TRUE, adhoc); } @@ -3720,7 +3722,7 @@ make_wpa_setting (shvarFile *ifcfg, g_object_set (wsec, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "sae", NULL); } } else { - nm_assert (wpa_eap || ieee8021x); + nm_assert (wpa_eap || ieee8021x || wpa_owe); /* Adhoc mode is mutually exclusive with any 802.1x-based authentication */ if (adhoc) { @@ -3729,14 +3731,17 @@ make_wpa_setting (shvarFile *ifcfg, return NULL; } - *s_8021x = fill_8021x (ifcfg, file, v, TRUE, error); - if (!*s_8021x) - return NULL; + if (wpa_owe) { + g_object_set (wsec, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "owe", NULL); + } else { + *s_8021x = fill_8021x (ifcfg, file, v, TRUE, error); + if (!*s_8021x) + return NULL; - { - gs_free char *lower = g_ascii_strdown (v, -1); - - g_object_set (wsec, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, lower, NULL); + { + gs_free char *lower = g_ascii_strdown (v, -1); + g_object_set (wsec, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, lower, NULL); + } } } diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c index d33845c28c..415242512e 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c @@ -583,6 +583,10 @@ write_wireless_security_setting (NMConnection *connection, svSetValueStr (ifcfg, "KEY_MGMT", "SAE"); wpa = TRUE; *no_8021x = TRUE; + } else if (!strcmp (key_mgmt, "owe")) { + svSetValueStr (ifcfg, "KEY_MGMT", "OWE"); + wpa = FALSE; + *no_8021x = TRUE; } else if (!strcmp (key_mgmt, "ieee8021x")) { svSetValueStr (ifcfg, "KEY_MGMT", "IEEE8021X"); dynamic_wep = TRUE; diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe new file mode 100644 index 0000000000..354046ad08 --- /dev/null +++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe @@ -0,0 +1,5 @@ +TYPE=Wireless +DEVICE=wlan1 +ESSID=blahblah_owe +MODE=Managed +KEY_MGMT=OWE diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c index 675421d3c8..74f8afc907 100644 --- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -3034,6 +3034,45 @@ test_read_wifi_sae (void) g_assert (!nm_setting_wireless_security_get_auth_alg (s_wsec)); } +static void +test_read_wifi_owe (void) +{ + gs_unref_object NMConnection *connection = NULL; + NMSettingConnection *s_con; + NMSettingWireless *s_wireless; + NMSettingWirelessSecurity *s_wsec; + GBytes *ssid; + const char *expected_ssid = "blahblah_owe"; + + connection = _connection_from_file (TEST_IFCFG_DIR"/ifcfg-test-wifi-owe", + NULL, TYPE_WIRELESS, NULL); + + s_con = nm_connection_get_setting_connection (connection); + g_assert (s_con); + g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "System blahblah_owe (test-wifi-owe)"); + + g_assert_cmpint (nm_setting_connection_get_timestamp (s_con), ==, 0); + g_assert (nm_setting_connection_get_autoconnect (s_con)); + + s_wireless = nm_connection_get_setting_wireless (connection); + g_assert (s_wireless); + + g_assert_cmpint (nm_setting_wireless_get_mtu (s_wireless), ==, 0); + + ssid = nm_setting_wireless_get_ssid (s_wireless); + g_assert (ssid); + g_assert_cmpmem (g_bytes_get_data (ssid, NULL), g_bytes_get_size (ssid), expected_ssid, strlen (expected_ssid)); + + g_assert (!nm_setting_wireless_get_bssid (s_wireless)); + g_assert_cmpstr (nm_setting_wireless_get_mode (s_wireless), ==, "infrastructure"); + + s_wsec = nm_connection_get_setting_wireless_security (connection); + g_assert (s_wsec); + g_assert_cmpstr (nm_setting_wireless_security_get_key_mgmt (s_wsec), ==, "owe"); + g_assert (!nm_setting_wireless_security_get_psk (s_wsec)); + g_assert (!nm_setting_wireless_security_get_auth_alg (s_wsec)); +} + static void test_read_wifi_wpa_psk_2 (void) { @@ -10322,6 +10361,7 @@ int main (int argc, char **argv) g_test_add_func (TPATH "wifi/read/wpa-psk/adhoc", test_read_wifi_wpa_psk_adhoc); g_test_add_func (TPATH "wifi/read/wpa-psk/hex", test_read_wifi_wpa_psk_hex); g_test_add_func (TPATH "wifi/read/sae", test_read_wifi_sae); + g_test_add_func (TPATH "wifi/read/owe", test_read_wifi_owe); g_test_add_func (TPATH "wifi/read/dynamic-wep/leap", test_read_wifi_dynamic_wep_leap); g_test_add_func (TPATH "wifi/read/wpa/eap/tls", test_read_wifi_wpa_eap_tls); g_test_add_func (TPATH "wifi/read/wpa/eap/ttls/tls", test_read_wifi_wpa_eap_ttls_tls); From 9a2bbbbc7afa3cf30ebf12430fd17a81b77889e0 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 17 Nov 2019 22:21:33 +0100 Subject: [PATCH 030/109] wifi/utils: complete key-mgmt=owe for OWE capable APs --- src/devices/wifi/nm-wifi-utils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/devices/wifi/nm-wifi-utils.c b/src/devices/wifi/nm-wifi-utils.c index b9b7ec42e5..7cb5f85bdd 100644 --- a/src/devices/wifi/nm-wifi-utils.c +++ b/src/devices/wifi/nm-wifi-utils.c @@ -759,6 +759,12 @@ nm_wifi_utils_complete_connection (GBytes *ap_ssid, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "sae", NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "open", NULL); + } else if ( (key_mgmt && !strcmp (key_mgmt, "owe")) + || (ap_rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_OWE)) { + g_object_set (s_wsec, + NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "owe", + NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "open", + NULL); } else if ( (key_mgmt && !strcmp (key_mgmt, "wpa-psk")) || (ap_wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK) || (ap_rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK)) { From 046f6f7227142f2fbf614bef28170e25c30043f8 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 17 Nov 2019 22:22:03 +0100 Subject: [PATCH 031/109] clients/meta-setting-desc: allow setting wifi-sec.key-mgmt to OWE --- clients/common/nm-meta-setting-desc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index 8e05c9bc5d..d28efa0753 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -7325,7 +7325,7 @@ static const NMMetaPropertyInfo *const property_infos_WIRELESS_SECURITY[] = { PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, .property_type = &_pt_gobject_string, .property_typ_data = DEFINE_PROPERTY_TYP_DATA ( - .values_static = NM_MAKE_STRV ("none", "ieee8021x", "wpa-psk", "wpa-eap", "sae"), + .values_static = NM_MAKE_STRV ("none", "ieee8021x", "wpa-psk", "wpa-eap", "sae", "owe"), ), ), PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX, From f7aa5b3a3696972f70f7854195a747b6c9436e0c Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 17 Nov 2019 22:23:30 +0100 Subject: [PATCH 032/109] clients/secret-agent: don't require secrets for OWE connections --- clients/common/nm-secret-agent-simple.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c index 2bf69b20ae..ca9250ca6f 100644 --- a/clients/common/nm-secret-agent-simple.c +++ b/clients/common/nm-secret-agent-simple.c @@ -302,7 +302,7 @@ add_wireless_secrets (RequestData *request, const char *key_mgmt = nm_setting_wireless_security_get_key_mgmt (s_wsec); NMSecretAgentSimpleSecret *secret; - if (!key_mgmt) + if (!key_mgmt || nm_streq (key_mgmt, "owe")) return FALSE; if (NM_IN_STRSET (key_mgmt, "wpa-psk", "sae")) { From 977c0c23875f7275ed68ba7595d44078d151af16 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 17 Nov 2019 22:24:19 +0100 Subject: [PATCH 033/109] client/cli: add support for OWE key management flag --- clients/cli/devices.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 4908d1808a..a3c3ba8dae 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -28,7 +28,7 @@ static char * ap_wpa_rsn_flags_to_string (NM80211ApSecurityFlags flags) { - char *flags_str[13]; + char *flags_str[14]; int i = 0; if (flags & NM_802_11_AP_SEC_PAIR_WEP40) @@ -53,6 +53,8 @@ ap_wpa_rsn_flags_to_string (NM80211ApSecurityFlags flags) flags_str[i++] = "802.1X"; if (flags & NM_802_11_AP_SEC_KEY_MGMT_SAE) flags_str[i++] = "sae"; + if (flags & NM_802_11_AP_SEC_KEY_MGMT_OWE) + flags_str[i++] = "owe"; /* Make sure you grow flags_str when adding items here. */ if (i == 0) @@ -1204,6 +1206,9 @@ fill_output_access_point (gpointer data, gpointer user_data) if (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_SAE) { g_string_append (security_str, "WPA3 "); } + if (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_OWE) { + g_string_append (security_str, "OWE "); + } if ( (wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X) || (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) { g_string_append (security_str, "802.1X "); @@ -3558,8 +3563,8 @@ do_device_wifi_connect (NmCli *nmc, int argc, char **argv) /* Set password for WEP or WPA-PSK. */ if ( (ap_flags & NM_802_11_AP_FLAGS_PRIVACY) - || ap_wpa_flags != NM_802_11_AP_SEC_NONE - || ap_rsn_flags != NM_802_11_AP_SEC_NONE) { + || (ap_wpa_flags != NM_802_11_AP_SEC_NONE && !(ap_wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_OWE)) + || (ap_rsn_flags != NM_802_11_AP_SEC_NONE && !(ap_rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_OWE))) { const char *con_password = NULL; NMSettingWirelessSecurity *s_wsec = NULL; @@ -4231,6 +4236,9 @@ print_wifi_connection (const NmcConfig *nmc_config, NMConnection *connection) || strcmp (key_mgmt, "sae") == 0) { type = "WPA"; g_print ("%s: WPA\n", _("Security")); + } else if ( strcmp (key_mgmt, "owe") == 0) { + type = "nopass"; + g_print ("%s: OWE\n", _("Security")); } if (psk) From a8d5fef607c2a2f6259ba4c2697ac9a7f94fdc31 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 17 Nov 2019 23:55:07 +0100 Subject: [PATCH 034/109] client/tui: add OWE support --- clients/tui/nm-editor-bindings.c | 9 +++++++++ clients/tui/nmt-page-wifi.c | 1 + 2 files changed, 10 insertions(+) diff --git a/clients/tui/nm-editor-bindings.c b/clients/tui/nm-editor-bindings.c index 00a34fbfbf..8e6c9600d7 100644 --- a/clients/tui/nm-editor-bindings.c +++ b/clients/tui/nm-editor-bindings.c @@ -595,6 +595,9 @@ get_security_type (NMEditorWirelessSecurityMethodBinding *binding) if (!strcmp (key_mgmt, "sae")) return "wpa3-personal"; + if (!strcmp (key_mgmt, "owe")) + return "owe"; + if (!strcmp (key_mgmt, "wpa-eap")) return "wpa-enterprise"; @@ -705,6 +708,12 @@ wireless_security_target_changed (GObject *object, NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, NULL, NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, NM_WEP_KEY_TYPE_UNKNOWN, NULL); + } else if (!strcmp (method, "owe")) { + g_object_set (binding->s_wsec, + NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "owe", + NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, NULL, + NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, NM_WEP_KEY_TYPE_UNKNOWN, + NULL); } else if (!strcmp (method, "wpa-enterprise")) { g_object_set (binding->s_wsec, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "wpa-eap", diff --git a/clients/tui/nmt-page-wifi.c b/clients/tui/nmt-page-wifi.c index 2e738ac695..9494423b77 100644 --- a/clients/tui/nmt-page-wifi.c +++ b/clients/tui/nmt-page-wifi.c @@ -72,6 +72,7 @@ static NmtNewtPopupEntry wifi_security[] = { { N_("WEP 128-bit Passphrase"), "wep-passphrase" }, { N_("Dynamic WEP (802.1x)"), "dynamic-wep" }, { N_("LEAP"), "leap" }, + { N_("Enhanced Open (OWE)"), "owe" }, { NULL, NULL } }; From cb33a27f96a4c8ea6d2bda3839540058fe5a6f27 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 17 Nov 2019 23:57:15 +0100 Subject: [PATCH 035/109] libnm/utils: add OWE security type --- libnm-core/nm-utils.c | 11 +++++++++++ libnm-core/nm-utils.h | 2 ++ 2 files changed, 13 insertions(+) diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index 4659734b6b..bb79476fa1 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -1120,6 +1120,7 @@ nm_utils_ap_mode_security_valid (NMUtilsSecurityType type, case NMU_SEC_WPA_PSK: case NMU_SEC_WPA2_PSK: case NMU_SEC_SAE: + case NMU_SEC_OWE: return TRUE; default: break; @@ -1300,6 +1301,16 @@ nm_utils_security_valid (NMUtilsSecurityType type, return FALSE; } break; + case NMU_SEC_OWE: + if (adhoc) + return FALSE; + if (!(wifi_caps & NM_WIFI_DEVICE_CAP_RSN)) + return FALSE; + if (have_ap) { + if (!(ap_rsn & NM_802_11_AP_SEC_KEY_MGMT_OWE)) + return FALSE; + } + break; default: good = FALSE; break; diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h index 5418a1e69d..4cbf24abad 100644 --- a/libnm-core/nm-utils.h +++ b/libnm-core/nm-utils.h @@ -51,6 +51,7 @@ char * nm_utils_ssid_to_utf8 (const guint8 *ssid, gsize len); * @NMU_SEC_WPA2_PSK: WPA2/RSN is used with Pre-Shared Keys (PSK) * @NMU_SEC_WPA2_ENTERPRISE: WPA2 is used with 802.1x authentication * @NMU_SEC_SAE: is used with WPA3 Enterprise + * @NMU_SEC_OWE: is used with Enhanced Open * * Describes generic security mechanisms that 802.11 access points may offer. * Used with nm_utils_security_valid() for checking whether a given access @@ -67,6 +68,7 @@ typedef enum { NMU_SEC_WPA2_PSK, NMU_SEC_WPA2_ENTERPRISE, NMU_SEC_SAE, + NMU_SEC_OWE, } NMUtilsSecurityType; gboolean nm_utils_security_valid (NMUtilsSecurityType type, From fc42a74ece08958a0194ee96d94c4102dd1681a6 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 17 Nov 2019 23:57:38 +0100 Subject: [PATCH 036/109] libnm-core: support OWE when determining AP compatibility --- libnm-core/nm-setting-wireless.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c index 1731673f9d..373a1a3b63 100644 --- a/libnm-core/nm-setting-wireless.c +++ b/libnm-core/nm-setting-wireless.c @@ -206,7 +206,8 @@ nm_setting_wireless_ap_security_compatible (NMSettingWireless *s_wireless, /* WPA[2]-PSK and WPA[2] Enterprise */ if ( !strcmp (key_mgmt, "wpa-psk") || !strcmp (key_mgmt, "wpa-eap") - || !strcmp (key_mgmt, "sae")) { + || !strcmp (key_mgmt, "sae") + || !strcmp (key_mgmt, "owe")) { if (!strcmp (key_mgmt, "wpa-psk")) { if ( !(ap_wpa & NM_802_11_AP_SEC_KEY_MGMT_PSK) @@ -220,6 +221,10 @@ nm_setting_wireless_ap_security_compatible (NMSettingWireless *s_wireless, if ( !(ap_wpa & NM_802_11_AP_SEC_KEY_MGMT_SAE) && !(ap_rsn & NM_802_11_AP_SEC_KEY_MGMT_SAE)) return FALSE; + } else if (!strcmp (key_mgmt, "owe")) { + if ( !(ap_wpa & NM_802_11_AP_SEC_KEY_MGMT_OWE) + && !(ap_rsn & NM_802_11_AP_SEC_KEY_MGMT_OWE)) + return FALSE; } // FIXME: should handle WPA and RSN separately here to ensure that From 93e9010b75700c8a0191f10d92e8f21d2ca988c6 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Tue, 26 Nov 2019 10:58:49 +0100 Subject: [PATCH 037/109] device: don't transition assumed devices to FAILED before ACTIVATED If the activation of an assumed device fails, we first set the device state to FAILED and then to ACTIVATED. In the FAILED state, the active connection transitions to DEACTIVATED and clears its device pointer; hence we end up with an inconsistent state which causes assertion failures in other parts of the code (for example, get_best_ip_config() assumes that the device of the best active connection is not NULL). Don't first transition to FAILED and then to ACTIVATED, just set the latter. https://bugzilla.redhat.com/show_bug.cgi?id=1737774 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/351 --- src/devices/nm-device.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index c4e7b80c69..c50aa42ac7 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -15476,6 +15476,13 @@ _set_state_full (NMDevice *self, old_state = priv->state; + if ( state == NM_DEVICE_STATE_FAILED + && nm_device_sys_iface_state_is_external_or_assume (self)) { + /* Avoid tearing down assumed connection, assume it's connected */ + state = NM_DEVICE_STATE_ACTIVATED; + reason = NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED; + } + /* Do nothing if state isn't changing, but as a special case allow * re-setting UNAVAILABLE if the device is missing firmware so that we * can retry device initialization. @@ -15727,14 +15734,6 @@ _set_state_full (NMDevice *self, */ _cancel_activation (self); - if (nm_device_sys_iface_state_is_external_or_assume (self)) { - /* Avoid tearing down assumed connection, assume it's connected */ - nm_device_queue_state (self, - NM_DEVICE_STATE_ACTIVATED, - NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED); - break; - } - sett_conn = nm_device_get_settings_connection (self); _LOGW (LOGD_DEVICE | LOGD_WIFI, "Activation: failed for connection '%s'", From 4eed1a65968ecc4ca461471f6e7084b0609af004 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sun, 8 Dec 2019 15:49:24 +0100 Subject: [PATCH 038/109] libnm/docs: fix gtk-doc for #NMDhcpHostnameFlags --- libnm-core/nm-setting-ip-config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnm-core/nm-setting-ip-config.h b/libnm-core/nm-setting-ip-config.h index c97367267a..ef3671c40b 100644 --- a/libnm-core/nm-setting-ip-config.h +++ b/libnm-core/nm-setting-ip-config.h @@ -405,7 +405,7 @@ typedef struct { * sent in the DHCP FQDN option. When cleared and all other FQDN * flags are zero, standard FQDN flags are sent. This flag is * incompatible with any other FQDN flag. - * * + * * #NMDhcpHostnameFlags describe flags related to the DHCP hostname and * FQDN. * From 9d602529cc5e7442d545979ea6ea79af5046e6fc Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 5 Dec 2019 12:27:13 +0100 Subject: [PATCH 039/109] settings/trivial: comment why we create GDBusConnection for ifcfg D-Bus interface There is nothing to fix. Replace the FIXME comment. --- src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c index 453307ad85..19c4f51eb4 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c @@ -1132,8 +1132,8 @@ _dbus_setup (NMSIfcfgRHPlugin *self) _dbus_clear (self); - /* FIXME: we don't need a separate GDBusConnection. Just reuse the one from - * nm_dbus_manager_get_dbus_connection(). */ + /* We use a separate D-Bus connection so that org.freedesktop.NetworkManager and com.redhat.ifcfgrh1 + * are exported by different connections. */ address = g_dbus_address_get_for_bus_sync (G_BUS_TYPE_SYSTEM, NULL, &error); if (address == NULL) { _LOGW ("dbus: failed getting address for system bus: %s", error->message); From 1e742e0fb48db1756f9887fdb145f2da85c60066 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 9 Dec 2019 09:02:24 +0100 Subject: [PATCH 040/109] ifcfg: don't use D-Bus connection if NMDBusManager is without main connection In configure-and-quit mode, NMDBusManager does not have a D-Bus connection. Likewise, ifcfg-rh plugin should not use one either. --- src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c index 19c4f51eb4..c1396f7381 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c @@ -20,6 +20,7 @@ #include "nm-utils.h" #include "nm-core-internal.h" #include "nm-config.h" +#include "nm-dbus-manager.h" #include "settings/nm-settings-plugin.h" #include "settings/nm-settings-utils.h" #include "NetworkManagerUtils.h" @@ -1132,6 +1133,11 @@ _dbus_setup (NMSIfcfgRHPlugin *self) _dbus_clear (self); + if (!NM_MAIN_DBUS_CONNECTION_GET) { + _LOGW ("dbus: don't use D-Bus for %s service", IFCFGRH1_BUS_NAME); + return; + } + /* We use a separate D-Bus connection so that org.freedesktop.NetworkManager and com.redhat.ifcfgrh1 * are exported by different connections. */ address = g_dbus_address_get_for_bus_sync (G_BUS_TYPE_SYSTEM, NULL, &error); From eb642fecdf4f57d4e8673065063cf429e986014a Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 9 Dec 2019 09:48:02 +0100 Subject: [PATCH 041/109] settings: fix use after free in keyfile's load_connections() Fixes: d35d3c468a30 ('settings: rework tracking settings connections and settings plugins') --- src/settings/plugins/keyfile/nms-keyfile-plugin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings/plugins/keyfile/nms-keyfile-plugin.c b/src/settings/plugins/keyfile/nms-keyfile-plugin.c index 7129d6f316..fdb88d2a6d 100644 --- a/src/settings/plugins/keyfile/nms-keyfile-plugin.c +++ b/src/settings/plugins/keyfile/nms-keyfile-plugin.c @@ -355,7 +355,7 @@ _load_file (NMSKeyfilePlugin *self, &local); if (!connection) { if (error) - g_propagate_error (error, local); + g_propagate_error (error, g_steal_pointer (&local)); else _LOGW ("load: \"%s\": failed to load connection: %s", full_filename, local->message); return NULL; From e0569ee575a40f401b2cca1acbd9cddd5fa567cd Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 9 Dec 2019 09:51:55 +0100 Subject: [PATCH 042/109] settings: assert that we don't leak error variable in impl_settings_load_connections() --- src/settings/nm-settings.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index 1029474fc5..f964fb16e4 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -2750,9 +2750,10 @@ impl_settings_load_connections (NMDBusObject *obj, for (i = 0; i < n_entries; i++) { NMSettingsPluginConnectionLoadEntry *entry = &entries[i]; - if (!entry->handled) + if (!entry->handled) { _LOGW ("load: no settings plugin could load \"%s\"", entry->filename); - else if (entry->error) { + nm_assert (!entry->error); + } else if (entry->error) { _LOGW ("load: failure to load \"%s\": %s", entry->filename, entry->error->message); g_clear_error (&entry->error); } else From b650d1d181a2993108d669beb22b035043c08398 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 6 Dec 2019 11:53:44 +0100 Subject: [PATCH 043/109] core: also check "org.freedesktop.NetworkManager.wifi.scan" permissions --- src/nm-manager.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/nm-manager.c b/src/nm-manager.c index f4cbc6ec2e..22d5a88a86 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -6245,6 +6245,7 @@ get_permissions_done_cb (NMAuthChain *chain, get_perm_add_result (self, chain, &results, NM_AUTH_PERMISSION_CHECKPOINT_ROLLBACK); get_perm_add_result (self, chain, &results, NM_AUTH_PERMISSION_ENABLE_DISABLE_STATISTICS); get_perm_add_result (self, chain, &results, NM_AUTH_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK); + get_perm_add_result (self, chain, &results, NM_AUTH_PERMISSION_WIFI_SCAN); g_dbus_method_invocation_return_value (context, g_variant_new ("(a{ss})", &results)); @@ -6289,6 +6290,7 @@ impl_manager_get_permissions (NMDBusObject *obj, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_CHECKPOINT_ROLLBACK, FALSE); nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_ENABLE_DISABLE_STATISTICS, FALSE); nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK, FALSE); + nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_WIFI_SCAN, FALSE); } static void From 50a12ce2d57b7bcd7f7c8a5bb9ad0f4b77a3ec71 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 5 Dec 2019 13:54:27 +0100 Subject: [PATCH 044/109] core: also return unknown permission check result MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For example with mount -o remount,rw,hidepid=1 /proc/ all permission checks will fail with an error. Internally, we map the failure to NM_AUTH_CALL_RESULT_UNKNOWN. [1575645672.5958] auth: call[1069]: CheckAuthorization(org.freedesktop.NetworkManager.enable-disable-connectivity-check), subject=unix-process[pid=468316, uid=1000, start=1912881] [1575645672.6295] auth: call[1069]: completed: failed: GDBus.Error:org.gtk.GDBus.UnmappedGError.Quark._g_2dfile_2derror_2dquark.Code4: Failed to open file “/proc/468316/status”: No such file or directory [1575645672.6296] manager: unknown auth chain result 0 First of all, we should not log a debug message about that (we already log the result of permission checks separately). Also, we should include the unknown result in the response. The permission was checked, and omitting it from GetPermissions() result seems wrong (even if we failed to get the result). Note that "unknown" is now a new possible return value on D-Bus. But see how nm_permission_result_to_client() would map such a value to "unknown" as well. So, it's probably a fine extension of the D-Bus API. Note that NMClient API is currently quite limited. The user won't know whether permissions were received (and if they were received, they could not distinguish between UNKNOWN and absent). Hence, returning all permissions as unknown (or not at all) causes `nmcli general permissions` to hang. The solution here is to improve NMClient API to allow the user to know when the permissions are received. But this patch doesn't fix the hanging of nmcli nor the limitation of NMClient's API. --- clients/cli/general.c | 5 ++++- src/nm-manager.c | 7 ++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/clients/cli/general.c b/clients/cli/general.c index 123cc5b4fc..8d9e1b3929 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -582,7 +582,10 @@ got_permissions (NmCli *nmc) NMClientPermission perm; /* The server returns all the permissions at once, so if at least one is there - * we already received the reply. */ + * we already received the reply. + * + * FIXME: this is wrong, because all permissions could be unknown. We should instead + * have a signal in NMClient to indicate when permissions are received. */ for (perm = NM_CLIENT_PERMISSION_NONE + 1; perm <= NM_CLIENT_PERMISSION_LAST; perm++) { if (nm_client_get_permission_result (nmc->client, perm) != NM_CLIENT_PERMISSION_RESULT_UNKNOWN) return TRUE; diff --git a/src/nm-manager.c b/src/nm-manager.c index 22d5a88a86..8540a88f43 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -6210,9 +6210,10 @@ get_perm_add_result (NMManager *self, NMAuthChain *chain, GVariantBuilder *resul g_variant_builder_add (results, "{ss}", permission, "no"); else if (result == NM_AUTH_CALL_RESULT_AUTH) g_variant_builder_add (results, "{ss}", permission, "auth"); - else { - _LOGD (LOGD_CORE, "unknown auth chain result %d", result); - } + else if (result == NM_AUTH_CALL_RESULT_UNKNOWN) + g_variant_builder_add (results, "{ss}", permission, "unknown"); + else + nm_assert_not_reached (); } static void From 5ad095374f04d2ffd34eceec099126ffa41e2173 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 5 Dec 2019 13:57:49 +0100 Subject: [PATCH 045/109] libnm: move NMClientPermission/NMClientPermissionResult enums from libnm to libnm-core We will also use the enum from core. --- libnm-core/nm-dbus-interface.h | 81 ++++++++++++++++++++++++++++++++++ libnm/nm-client.h | 81 ---------------------------------- 2 files changed, 81 insertions(+), 81 deletions(-) diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h index 6f7bf4c95f..3e4c1b616c 100644 --- a/libnm-core/nm-dbus-interface.h +++ b/libnm-core/nm-dbus-interface.h @@ -1177,4 +1177,85 @@ typedef enum { /*< flags >*/ NM_DEVICE_INTERFACE_FLAG_CARRIER = 0x10000, } NMDeviceInterfaceFlags; +/** + * NMClientPermission: + * @NM_CLIENT_PERMISSION_NONE: unknown or no permission + * @NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK: controls whether networking + * can be globally enabled or disabled + * @NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI: controls whether Wi-Fi can be + * globally enabled or disabled + * @NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN: controls whether WWAN (3G) can be + * globally enabled or disabled + * @NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX: controls whether WiMAX can be + * globally enabled or disabled + * @NM_CLIENT_PERMISSION_SLEEP_WAKE: controls whether the client can ask + * NetworkManager to sleep and wake + * @NM_CLIENT_PERMISSION_NETWORK_CONTROL: controls whether networking connections + * can be started, stopped, and changed + * @NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED: controls whether a password + * protected Wi-Fi hotspot can be created + * @NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN: controls whether an open Wi-Fi hotspot + * can be created + * @NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM: controls whether connections + * that are available to all users can be modified + * @NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN: controls whether connections + * owned by the current user can be modified + * @NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME: controls whether the + * persistent hostname can be changed + * @NM_CLIENT_PERMISSION_SETTINGS_MODIFY_GLOBAL_DNS: modify persistent global + * DNS configuration + * @NM_CLIENT_PERMISSION_RELOAD: controls access to Reload. + * @NM_CLIENT_PERMISSION_CHECKPOINT_ROLLBACK: permission to create checkpoints. + * @NM_CLIENT_PERMISSION_ENABLE_DISABLE_STATISTICS: controls whether device + * statistics can be globally enabled or disabled + * @NM_CLIENT_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK: controls whether + * connectivity check can be enabled or disabled + * @NM_CLIENT_PERMISSION_WIFI_SCAN: controls whether wifi scans can be performed + * @NM_CLIENT_PERMISSION_LAST: a reserved boundary value + * + * #NMClientPermission values indicate various permissions that NetworkManager + * clients can obtain to perform certain tasks on behalf of the current user. + **/ +typedef enum { + NM_CLIENT_PERMISSION_NONE = 0, + NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK = 1, + NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI = 2, + NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN = 3, + NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX = 4, + NM_CLIENT_PERMISSION_SLEEP_WAKE = 5, + NM_CLIENT_PERMISSION_NETWORK_CONTROL = 6, + NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED = 7, + NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN = 8, + NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM = 9, + NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN = 10, + NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME = 11, + NM_CLIENT_PERMISSION_SETTINGS_MODIFY_GLOBAL_DNS = 12, + NM_CLIENT_PERMISSION_RELOAD = 13, + NM_CLIENT_PERMISSION_CHECKPOINT_ROLLBACK = 14, + NM_CLIENT_PERMISSION_ENABLE_DISABLE_STATISTICS = 15, + NM_CLIENT_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK = 16, + NM_CLIENT_PERMISSION_WIFI_SCAN = 17, + + NM_CLIENT_PERMISSION_LAST = 17, +} NMClientPermission; + +/** + * NMClientPermissionResult: + * @NM_CLIENT_PERMISSION_RESULT_UNKNOWN: unknown or no authorization + * @NM_CLIENT_PERMISSION_RESULT_YES: the permission is available + * @NM_CLIENT_PERMISSION_RESULT_AUTH: authorization is necessary before the + * permission is available + * @NM_CLIENT_PERMISSION_RESULT_NO: permission to perform the operation is + * denied by system policy + * + * #NMClientPermissionResult values indicate what authorizations and permissions + * the user requires to obtain a given #NMClientPermission + **/ +typedef enum { + NM_CLIENT_PERMISSION_RESULT_UNKNOWN = 0, + NM_CLIENT_PERMISSION_RESULT_YES, + NM_CLIENT_PERMISSION_RESULT_AUTH, + NM_CLIENT_PERMISSION_RESULT_NO +} NMClientPermissionResult; + #endif /* __NM_DBUS_INTERFACE_H__ */ diff --git a/libnm/nm-client.h b/libnm/nm-client.h index ad17bf3892..6bff58684e 100644 --- a/libnm/nm-client.h +++ b/libnm/nm-client.h @@ -74,87 +74,6 @@ _NM_DEPRECATED_SYNC_WRITABLE_PROPERTY #define NM_CLIENT_ACTIVE_CONNECTION_ADDED "active-connection-added" #define NM_CLIENT_ACTIVE_CONNECTION_REMOVED "active-connection-removed" -/** - * NMClientPermission: - * @NM_CLIENT_PERMISSION_NONE: unknown or no permission - * @NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK: controls whether networking - * can be globally enabled or disabled - * @NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI: controls whether Wi-Fi can be - * globally enabled or disabled - * @NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN: controls whether WWAN (3G) can be - * globally enabled or disabled - * @NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX: controls whether WiMAX can be - * globally enabled or disabled - * @NM_CLIENT_PERMISSION_SLEEP_WAKE: controls whether the client can ask - * NetworkManager to sleep and wake - * @NM_CLIENT_PERMISSION_NETWORK_CONTROL: controls whether networking connections - * can be started, stopped, and changed - * @NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED: controls whether a password - * protected Wi-Fi hotspot can be created - * @NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN: controls whether an open Wi-Fi hotspot - * can be created - * @NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM: controls whether connections - * that are available to all users can be modified - * @NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN: controls whether connections - * owned by the current user can be modified - * @NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME: controls whether the - * persistent hostname can be changed - * @NM_CLIENT_PERMISSION_SETTINGS_MODIFY_GLOBAL_DNS: modify persistent global - * DNS configuration - * @NM_CLIENT_PERMISSION_RELOAD: controls access to Reload. - * @NM_CLIENT_PERMISSION_CHECKPOINT_ROLLBACK: permission to create checkpoints. - * @NM_CLIENT_PERMISSION_ENABLE_DISABLE_STATISTICS: controls whether device - * statistics can be globally enabled or disabled - * @NM_CLIENT_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK: controls whether - * connectivity check can be enabled or disabled - * @NM_CLIENT_PERMISSION_WIFI_SCAN: controls whether wifi scans can be performed - * @NM_CLIENT_PERMISSION_LAST: a reserved boundary value - * - * #NMClientPermission values indicate various permissions that NetworkManager - * clients can obtain to perform certain tasks on behalf of the current user. - **/ -typedef enum { - NM_CLIENT_PERMISSION_NONE = 0, - NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK = 1, - NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI = 2, - NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN = 3, - NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX = 4, - NM_CLIENT_PERMISSION_SLEEP_WAKE = 5, - NM_CLIENT_PERMISSION_NETWORK_CONTROL = 6, - NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED = 7, - NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN = 8, - NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM = 9, - NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN = 10, - NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME = 11, - NM_CLIENT_PERMISSION_SETTINGS_MODIFY_GLOBAL_DNS = 12, - NM_CLIENT_PERMISSION_RELOAD = 13, - NM_CLIENT_PERMISSION_CHECKPOINT_ROLLBACK = 14, - NM_CLIENT_PERMISSION_ENABLE_DISABLE_STATISTICS = 15, - NM_CLIENT_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK = 16, - NM_CLIENT_PERMISSION_WIFI_SCAN = 17, - - NM_CLIENT_PERMISSION_LAST = 17, -} NMClientPermission; - -/** - * NMClientPermissionResult: - * @NM_CLIENT_PERMISSION_RESULT_UNKNOWN: unknown or no authorization - * @NM_CLIENT_PERMISSION_RESULT_YES: the permission is available - * @NM_CLIENT_PERMISSION_RESULT_AUTH: authorization is necessary before the - * permission is available - * @NM_CLIENT_PERMISSION_RESULT_NO: permission to perform the operation is - * denied by system policy - * - * #NMClientPermissionResult values indicate what authorizations and permissions - * the user requires to obtain a given #NMClientPermission - **/ -typedef enum { - NM_CLIENT_PERMISSION_RESULT_UNKNOWN = 0, - NM_CLIENT_PERMISSION_RESULT_YES, - NM_CLIENT_PERMISSION_RESULT_AUTH, - NM_CLIENT_PERMISSION_RESULT_NO -} NMClientPermissionResult; - /** * NMClientError: * @NM_CLIENT_ERROR_FAILED: unknown or unclassified error From 09e17888f7f032810dbe21bbeab0fa38c7d0d72f Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 5 Dec 2019 14:16:48 +0100 Subject: [PATCH 046/109] libnm: add mapping functions between string and NMClientPermission enum --- libnm/tests/test-libnm.c | 45 ++++++++++ .../nm-libnm-core-utils.c | 90 +++++++++++++++++++ .../nm-libnm-core-utils.h | 8 ++ 3 files changed, 143 insertions(+) diff --git a/libnm/tests/test-libnm.c b/libnm/tests/test-libnm.c index 345fbb07b8..90d0cf0d3f 100644 --- a/libnm/tests/test-libnm.c +++ b/libnm/tests/test-libnm.c @@ -22,6 +22,7 @@ #include "nm-libnm-utils.h" #include "nm-object.h" #include "nm-vpn-service-plugin.h" +#include "nm-libnm-core-intern/nm-libnm-core-utils.h" #include "nm-utils/nm-test-utils.h" @@ -3064,6 +3065,49 @@ test_dbus_meta_types (void) g_assert (meta_iface->get_type_fcn() == d->gtype); } } + +/*****************************************************************************/ + +static void +test_nm_auth_permissions (void) +{ + int i, j; + + G_STATIC_ASSERT (G_N_ELEMENTS (nm_auth_permission_names_by_idx) == NM_CLIENT_PERMISSION_LAST); + G_STATIC_ASSERT (G_N_ELEMENTS (nm_auth_permission_sorted) == NM_CLIENT_PERMISSION_LAST); + + for (i = 0; i < NM_CLIENT_PERMISSION_LAST; i++) { + g_assert (nm_auth_permission_names_by_idx[i]); + g_assert (NM_STR_HAS_PREFIX (nm_auth_permission_names_by_idx[i], "org.freedesktop.NetworkManager.")); + g_assert_cmpint (nm_auth_permission_sorted[i], >, 0); + g_assert_cmpint (nm_auth_permission_sorted[i], <=, NM_CLIENT_PERMISSION_LAST); + for (j = i + 1; j < NM_CLIENT_PERMISSION_LAST; j++) { + g_assert_cmpint (nm_auth_permission_sorted[i], !=, nm_auth_permission_sorted[j]); + g_assert_cmpstr (nm_auth_permission_names_by_idx[i], !=, nm_auth_permission_names_by_idx[j]); + } + } + for (i = 1; i < NM_CLIENT_PERMISSION_LAST; i++) { + NMClientPermission a = nm_auth_permission_sorted[i - 1]; + NMClientPermission b = nm_auth_permission_sorted[i]; + const char *s_a = nm_auth_permission_names_by_idx[a - 1]; + const char *s_b = nm_auth_permission_names_by_idx[b - 1]; + + g_assert_cmpstr (s_a, <, s_b); + g_assert (a != b); + g_assert (s_a != s_b); + } + for (i = 1; i <= NM_CLIENT_PERMISSION_LAST; i++) { + const char *s = nm_auth_permission_to_string (i); + + g_assert_cmpstr (s, ==, nm_auth_permission_names_by_idx[i - 1]); + g_assert (s == nm_auth_permission_names_by_idx[i - 1]); + g_assert_cmpint (nm_auth_permission_from_string (s), ==, i); + } + return; + for (i = 0; i < NM_CLIENT_PERMISSION_LAST; i++) + g_assert_cmpint (nm_auth_permission_from_string (nm_auth_permission_names_by_idx[i]), ==, i + 1); +} + /*****************************************************************************/ NMTST_DEFINE (); @@ -3078,6 +3122,7 @@ int main (int argc, char **argv) g_test_add_func ("/libnm/general/test_types", test_types); g_test_add_func ("/libnm/general/test_nml_dbus_meta", test_nml_dbus_meta); g_test_add_func ("/libnm/general/test_dbus_meta_types", test_dbus_meta_types); + g_test_add_func ("/libnm/general/test_nm_auth_permissions", test_nm_auth_permissions); return g_test_run (); } diff --git a/shared/nm-libnm-core-intern/nm-libnm-core-utils.c b/shared/nm-libnm-core-intern/nm-libnm-core-utils.c index 9bf0b1202e..366d812a31 100644 --- a/shared/nm-libnm-core-intern/nm-libnm-core-utils.c +++ b/shared/nm-libnm-core-intern/nm-libnm-core-utils.c @@ -4,6 +4,8 @@ #include "nm-libnm-core-utils.h" +#include "nm-common-macros.h" + /*****************************************************************************/ gboolean @@ -59,3 +61,91 @@ nm_utils_vlan_priority_map_parse_str (NMVlanPriorityMap map_type, NM_SET_OUT (out_has_wildcard_to, v2 < 0); return TRUE; } + +/*****************************************************************************/ + +const char *const nm_auth_permission_names_by_idx[NM_CLIENT_PERMISSION_LAST] = { + [NM_CLIENT_PERMISSION_CHECKPOINT_ROLLBACK - 1] = NM_AUTH_PERMISSION_CHECKPOINT_ROLLBACK, + [NM_CLIENT_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK - 1] = NM_AUTH_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK, + [NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK - 1] = NM_AUTH_PERMISSION_ENABLE_DISABLE_NETWORK, + [NM_CLIENT_PERMISSION_ENABLE_DISABLE_STATISTICS - 1] = NM_AUTH_PERMISSION_ENABLE_DISABLE_STATISTICS, + [NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI - 1] = NM_AUTH_PERMISSION_ENABLE_DISABLE_WIFI, + [NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX - 1] = NM_AUTH_PERMISSION_ENABLE_DISABLE_WIMAX, + [NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN - 1] = NM_AUTH_PERMISSION_ENABLE_DISABLE_WWAN, + [NM_CLIENT_PERMISSION_NETWORK_CONTROL - 1] = NM_AUTH_PERMISSION_NETWORK_CONTROL, + [NM_CLIENT_PERMISSION_RELOAD - 1] = NM_AUTH_PERMISSION_RELOAD, + [NM_CLIENT_PERMISSION_SETTINGS_MODIFY_GLOBAL_DNS - 1] = NM_AUTH_PERMISSION_SETTINGS_MODIFY_GLOBAL_DNS, + [NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME - 1] = NM_AUTH_PERMISSION_SETTINGS_MODIFY_HOSTNAME, + [NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN - 1] = NM_AUTH_PERMISSION_SETTINGS_MODIFY_OWN, + [NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM - 1] = NM_AUTH_PERMISSION_SETTINGS_MODIFY_SYSTEM, + [NM_CLIENT_PERMISSION_SLEEP_WAKE - 1] = NM_AUTH_PERMISSION_SLEEP_WAKE, + [NM_CLIENT_PERMISSION_WIFI_SCAN - 1] = NM_AUTH_PERMISSION_WIFI_SCAN, + [NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN - 1] = NM_AUTH_PERMISSION_WIFI_SHARE_OPEN, + [NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED - 1] = NM_AUTH_PERMISSION_WIFI_SHARE_PROTECTED, +}; + +const NMClientPermission nm_auth_permission_sorted[NM_CLIENT_PERMISSION_LAST] = { + NM_CLIENT_PERMISSION_CHECKPOINT_ROLLBACK, + NM_CLIENT_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK, + NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK, + NM_CLIENT_PERMISSION_ENABLE_DISABLE_STATISTICS, + NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI, + NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX, + NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN, + NM_CLIENT_PERMISSION_NETWORK_CONTROL, + NM_CLIENT_PERMISSION_RELOAD, + NM_CLIENT_PERMISSION_SETTINGS_MODIFY_GLOBAL_DNS, + NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME, + NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN, + NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM, + NM_CLIENT_PERMISSION_SLEEP_WAKE, + NM_CLIENT_PERMISSION_WIFI_SCAN, + NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN, + NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED, +}; + +const char * +nm_auth_permission_to_string (NMClientPermission permission) +{ + if (permission < 1) + return NULL; + if (permission > NM_CLIENT_PERMISSION_LAST) + return NULL; + return nm_auth_permission_names_by_idx[permission - 1]; +} + +#define AUTH_PERMISSION_PREFIX "org.freedesktop.NetworkManager." + +static int +_nm_auth_permission_from_string_cmp (gconstpointer a, gconstpointer b, gpointer user_data) +{ + const NMClientPermission *const p = a; + const char *const needle = b; + const char *ss = nm_auth_permission_names_by_idx[*p - 1]; + + nm_assert (NM_STR_HAS_PREFIX (ss, AUTH_PERMISSION_PREFIX)); + nm_assert (ss[NM_STRLEN (AUTH_PERMISSION_PREFIX)] != '\0'); + + return strcmp (&ss[NM_STRLEN (AUTH_PERMISSION_PREFIX)], needle); +} + +NMClientPermission +nm_auth_permission_from_string (const char *str) +{ + gssize idx; + + if (!str) + return NM_CLIENT_PERMISSION_NONE; + + if (!NM_STR_HAS_PREFIX (str, AUTH_PERMISSION_PREFIX)) + return NM_CLIENT_PERMISSION_NONE; + idx = nm_utils_array_find_binary_search (nm_auth_permission_sorted, + sizeof (nm_auth_permission_sorted[0]), + G_N_ELEMENTS (nm_auth_permission_sorted), + &str[NM_STRLEN (AUTH_PERMISSION_PREFIX)], + _nm_auth_permission_from_string_cmp, + NULL); + if (idx < 0) + return NM_CLIENT_PERMISSION_NONE; + return nm_auth_permission_sorted[idx]; +} diff --git a/shared/nm-libnm-core-intern/nm-libnm-core-utils.h b/shared/nm-libnm-core-intern/nm-libnm-core-utils.h index 42e9fc6491..3e15394ea9 100644 --- a/shared/nm-libnm-core-intern/nm-libnm-core-utils.h +++ b/shared/nm-libnm-core-intern/nm-libnm-core-utils.h @@ -95,4 +95,12 @@ nm_setting_ip_config_get_addr_family (NMSettingIPConfig *s_ip) * depends on other factors. */ #define NM_INFINIBAND_MAX_MTU ((guint) 65520) +/*****************************************************************************/ + +extern const char *const nm_auth_permission_names_by_idx[NM_CLIENT_PERMISSION_LAST]; +extern const NMClientPermission nm_auth_permission_sorted[NM_CLIENT_PERMISSION_LAST]; + +const char *nm_auth_permission_to_string (NMClientPermission permission); +NMClientPermission nm_auth_permission_from_string (const char *str); + #endif /* __NM_LIBNM_SHARED_UTILS_H__ */ From bfdd352a616471532b96c2e03554ebaf5125998e Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 9 Dec 2019 08:02:01 +0100 Subject: [PATCH 047/109] libnm,cli: cleanup mapping between NMClientPermission and strings --- clients/cli/general.c | 40 ++----------------------- libnm/nm-client.c | 2 +- libnm/nm-libnm-utils.c | 66 ------------------------------------------ libnm/nm-libnm-utils.h | 2 -- 4 files changed, 3 insertions(+), 107 deletions(-) diff --git a/clients/cli/general.c b/clients/cli/general.c index 8d9e1b3929..8bf8ea2a13 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -77,44 +77,8 @@ connectivity_to_color (NMConnectivityState connectivity) static const char * permission_to_string (NMClientPermission perm) { - switch (perm) { - case NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK: - return NM_AUTH_PERMISSION_ENABLE_DISABLE_NETWORK; - case NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI: - return NM_AUTH_PERMISSION_ENABLE_DISABLE_WIFI; - case NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN: - return NM_AUTH_PERMISSION_ENABLE_DISABLE_WWAN; - case NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX: - return NM_AUTH_PERMISSION_ENABLE_DISABLE_WIMAX; - case NM_CLIENT_PERMISSION_SLEEP_WAKE: - return NM_AUTH_PERMISSION_SLEEP_WAKE; - case NM_CLIENT_PERMISSION_NETWORK_CONTROL: - return NM_AUTH_PERMISSION_NETWORK_CONTROL; - case NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED: - return NM_AUTH_PERMISSION_WIFI_SHARE_PROTECTED; - case NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN: - return NM_AUTH_PERMISSION_WIFI_SHARE_OPEN; - case NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM: - return NM_AUTH_PERMISSION_SETTINGS_MODIFY_SYSTEM; - case NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN: - return NM_AUTH_PERMISSION_SETTINGS_MODIFY_OWN; - case NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME: - return NM_AUTH_PERMISSION_SETTINGS_MODIFY_HOSTNAME; - case NM_CLIENT_PERMISSION_SETTINGS_MODIFY_GLOBAL_DNS: - return NM_AUTH_PERMISSION_SETTINGS_MODIFY_GLOBAL_DNS; - case NM_CLIENT_PERMISSION_RELOAD: - return NM_AUTH_PERMISSION_RELOAD; - case NM_CLIENT_PERMISSION_CHECKPOINT_ROLLBACK: - return NM_AUTH_PERMISSION_CHECKPOINT_ROLLBACK; - case NM_CLIENT_PERMISSION_ENABLE_DISABLE_STATISTICS: - return NM_AUTH_PERMISSION_ENABLE_DISABLE_STATISTICS; - case NM_CLIENT_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK: - return NM_AUTH_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK; - case NM_CLIENT_PERMISSION_WIFI_SCAN: - return NM_AUTH_PERMISSION_WIFI_SCAN; - default: - return _("unknown"); - } + return nm_auth_permission_to_string (perm) + ?: _("unknown"); } NM_UTILS_LOOKUP_STR_DEFINE_STATIC (permission_result_to_string, NMClientPermissionResult, diff --git a/libnm/nm-client.c b/libnm/nm-client.c index 1a1ed25694..f81cbb0695 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -3375,7 +3375,7 @@ _dbus_check_permissions_start_cb (GObject *source, GAsyncResult *result, gpointe NMClientPermission perm; NMClientPermissionResult perm_result; - perm = nm_permission_to_client (pkey); + perm = nm_auth_permission_from_string (pkey); if (perm == NM_CLIENT_PERMISSION_NONE) continue; diff --git a/libnm/nm-libnm-utils.c b/libnm/nm-libnm-utils.c index 73de75e36b..7fd6eafb07 100644 --- a/libnm/nm-libnm-utils.c +++ b/libnm/nm-libnm-utils.c @@ -663,72 +663,6 @@ nm_utils_fixup_product_string (const char *desc) /*****************************************************************************/ -NMClientPermission -nm_permission_to_client (const char *nm) -{ - static const struct { - const char *name; - NMClientPermission perm; - } list[] = { - { NM_AUTH_PERMISSION_CHECKPOINT_ROLLBACK, NM_CLIENT_PERMISSION_CHECKPOINT_ROLLBACK }, - { NM_AUTH_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK, NM_CLIENT_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK }, - { NM_AUTH_PERMISSION_ENABLE_DISABLE_NETWORK, NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK }, - { NM_AUTH_PERMISSION_ENABLE_DISABLE_STATISTICS, NM_CLIENT_PERMISSION_ENABLE_DISABLE_STATISTICS }, - { NM_AUTH_PERMISSION_ENABLE_DISABLE_WIFI, NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI }, - { NM_AUTH_PERMISSION_ENABLE_DISABLE_WIMAX, NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX }, - { NM_AUTH_PERMISSION_ENABLE_DISABLE_WWAN, NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN }, - { NM_AUTH_PERMISSION_NETWORK_CONTROL, NM_CLIENT_PERMISSION_NETWORK_CONTROL }, - { NM_AUTH_PERMISSION_RELOAD, NM_CLIENT_PERMISSION_RELOAD }, - { NM_AUTH_PERMISSION_SETTINGS_MODIFY_GLOBAL_DNS, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_GLOBAL_DNS }, - { NM_AUTH_PERMISSION_SETTINGS_MODIFY_HOSTNAME, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME }, - { NM_AUTH_PERMISSION_SETTINGS_MODIFY_OWN, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN }, - { NM_AUTH_PERMISSION_SETTINGS_MODIFY_SYSTEM, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM }, - { NM_AUTH_PERMISSION_SLEEP_WAKE, NM_CLIENT_PERMISSION_SLEEP_WAKE }, - { NM_AUTH_PERMISSION_WIFI_SCAN, NM_CLIENT_PERMISSION_WIFI_SCAN }, - { NM_AUTH_PERMISSION_WIFI_SHARE_OPEN, NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN }, - { NM_AUTH_PERMISSION_WIFI_SHARE_PROTECTED, NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED }, - }; - gssize idx; - -#if NM_MORE_ASSERTS > 10 - { - static gboolean checked = FALSE; - int i, j; - - if (!checked) { - checked = TRUE; - - for (i = 0; i < G_N_ELEMENTS (list); i++) { - - nm_assert (list[i].perm != NM_CLIENT_PERMISSION_NONE); - nm_assert (list[i].name && list[i].name[0]); - if (i > 0) { - if (strcmp (list[i - 1].name, list[i].name) >= 0) { - g_error ("list is not sorted by name: #%d (%s) should be after #%d (%s)", - i - 1, list[i - 1].name, i, list[i].name); - } - } - for (j = i + 1; j < G_N_ELEMENTS (list); j++) { - nm_assert (list[i].perm != list[j].perm); - } - } - } - } -#endif - - if (nm) { - idx = nm_utils_array_find_binary_search (list, - sizeof (list[0]), - G_N_ELEMENTS (list), - &nm, - nm_strcmp_p_with_data, - NULL); - if (idx >= 0) - return list[idx].perm; - } - return NM_CLIENT_PERMISSION_NONE; -} - NMClientPermissionResult nm_permission_result_to_client (const char *nm) { diff --git a/libnm/nm-libnm-utils.h b/libnm/nm-libnm-utils.h index 98739db47c..5ab10fcfeb 100644 --- a/libnm/nm-libnm-utils.h +++ b/libnm/nm-libnm-utils.h @@ -29,8 +29,6 @@ gboolean nm_utils_g_param_spec_is_default (const GParamSpec *pspec); /*****************************************************************************/ -NMClientPermission nm_permission_to_client (const char *nm); - NMClientPermissionResult nm_permission_result_to_client (const char *nm); /*****************************************************************************/ From b7462b1910b5b3debbeb208f82de3d4d3f92f224 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 5 Dec 2019 15:08:17 +0100 Subject: [PATCH 048/109] libnm,shared: move nm_permission_result_to_client() to shared's nm_client_permission_result_from_string() --- libnm/nm-client.c | 2 +- libnm/nm-libnm-utils.c | 16 ---------------- libnm/nm-libnm-utils.h | 4 ---- .../nm-libnm-core-intern/nm-libnm-core-utils.c | 16 ++++++++++++++++ .../nm-libnm-core-intern/nm-libnm-core-utils.h | 4 ++++ 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/libnm/nm-client.c b/libnm/nm-client.c index f81cbb0695..42cba4095d 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -3379,7 +3379,7 @@ _dbus_check_permissions_start_cb (GObject *source, GAsyncResult *result, gpointe if (perm == NM_CLIENT_PERMISSION_NONE) continue; - perm_result = nm_permission_result_to_client (pvalue); + perm_result = nm_client_permission_result_from_string (pvalue); g_hash_table_insert (priv->permissions, GUINT_TO_POINTER (perm), diff --git a/libnm/nm-libnm-utils.c b/libnm/nm-libnm-utils.c index 7fd6eafb07..662bc33fa5 100644 --- a/libnm/nm-libnm-utils.c +++ b/libnm/nm-libnm-utils.c @@ -663,22 +663,6 @@ nm_utils_fixup_product_string (const char *desc) /*****************************************************************************/ -NMClientPermissionResult -nm_permission_result_to_client (const char *nm) -{ - if (!nm) - return NM_CLIENT_PERMISSION_RESULT_UNKNOWN; - if (nm_streq (nm, "yes")) - return NM_CLIENT_PERMISSION_RESULT_YES; - if (nm_streq (nm, "no")) - return NM_CLIENT_PERMISSION_RESULT_NO; - if (nm_streq (nm, "auth")) - return NM_CLIENT_PERMISSION_RESULT_AUTH; - return NM_CLIENT_PERMISSION_RESULT_UNKNOWN; -} - -/*****************************************************************************/ - const NMLDBusMetaIface *const _nml_dbus_meta_ifaces[] = { &_nml_dbus_meta_iface_nm, &_nml_dbus_meta_iface_nm_accesspoint, diff --git a/libnm/nm-libnm-utils.h b/libnm/nm-libnm-utils.h index 5ab10fcfeb..304c35f4be 100644 --- a/libnm/nm-libnm-utils.h +++ b/libnm/nm-libnm-utils.h @@ -29,10 +29,6 @@ gboolean nm_utils_g_param_spec_is_default (const GParamSpec *pspec); /*****************************************************************************/ -NMClientPermissionResult nm_permission_result_to_client (const char *nm); - -/*****************************************************************************/ - typedef enum { _NML_DBUS_LOG_LEVEL_INITIALIZED = 0x01, diff --git a/shared/nm-libnm-core-intern/nm-libnm-core-utils.c b/shared/nm-libnm-core-intern/nm-libnm-core-utils.c index 366d812a31..087524bdd4 100644 --- a/shared/nm-libnm-core-intern/nm-libnm-core-utils.c +++ b/shared/nm-libnm-core-intern/nm-libnm-core-utils.c @@ -149,3 +149,19 @@ nm_auth_permission_from_string (const char *str) return NM_CLIENT_PERMISSION_NONE; return nm_auth_permission_sorted[idx]; } + +/*****************************************************************************/ + +NMClientPermissionResult +nm_client_permission_result_from_string (const char *nm) +{ + if (!nm) + return NM_CLIENT_PERMISSION_RESULT_UNKNOWN; + if (nm_streq (nm, "yes")) + return NM_CLIENT_PERMISSION_RESULT_YES; + if (nm_streq (nm, "no")) + return NM_CLIENT_PERMISSION_RESULT_NO; + if (nm_streq (nm, "auth")) + return NM_CLIENT_PERMISSION_RESULT_AUTH; + return NM_CLIENT_PERMISSION_RESULT_UNKNOWN; +} diff --git a/shared/nm-libnm-core-intern/nm-libnm-core-utils.h b/shared/nm-libnm-core-intern/nm-libnm-core-utils.h index 3e15394ea9..398c493d9d 100644 --- a/shared/nm-libnm-core-intern/nm-libnm-core-utils.h +++ b/shared/nm-libnm-core-intern/nm-libnm-core-utils.h @@ -103,4 +103,8 @@ extern const NMClientPermission nm_auth_permission_sorted[NM_CLIENT_PERMISSION_L const char *nm_auth_permission_to_string (NMClientPermission permission); NMClientPermission nm_auth_permission_from_string (const char *str); +/*****************************************************************************/ + +NMClientPermissionResult nm_client_permission_result_from_string (const char *nm); + #endif /* __NM_LIBNM_SHARED_UTILS_H__ */ From dab61a919b1d3dd7366cc68f3d96bb0621a0a495 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 5 Dec 2019 15:16:20 +0100 Subject: [PATCH 049/109] shared: add nm_client_permission_result_to_string() helper --- shared/nm-libnm-core-intern/nm-libnm-core-utils.c | 13 +++++++++++++ shared/nm-libnm-core-intern/nm-libnm-core-utils.h | 1 + 2 files changed, 14 insertions(+) diff --git a/shared/nm-libnm-core-intern/nm-libnm-core-utils.c b/shared/nm-libnm-core-intern/nm-libnm-core-utils.c index 087524bdd4..df2f2e7769 100644 --- a/shared/nm-libnm-core-intern/nm-libnm-core-utils.c +++ b/shared/nm-libnm-core-intern/nm-libnm-core-utils.c @@ -165,3 +165,16 @@ nm_client_permission_result_from_string (const char *nm) return NM_CLIENT_PERMISSION_RESULT_AUTH; return NM_CLIENT_PERMISSION_RESULT_UNKNOWN; } + +const char * +nm_client_permission_result_to_string (NMClientPermissionResult permission) +{ + switch (permission) { + case NM_CLIENT_PERMISSION_RESULT_YES: return "yes"; + case NM_CLIENT_PERMISSION_RESULT_NO: return "no"; + case NM_CLIENT_PERMISSION_RESULT_AUTH: return "auth"; + case NM_CLIENT_PERMISSION_RESULT_UNKNOWN: return "unknown"; + } + nm_assert_not_reached (); + return NULL; +} diff --git a/shared/nm-libnm-core-intern/nm-libnm-core-utils.h b/shared/nm-libnm-core-intern/nm-libnm-core-utils.h index 398c493d9d..65a6e74ef0 100644 --- a/shared/nm-libnm-core-intern/nm-libnm-core-utils.h +++ b/shared/nm-libnm-core-intern/nm-libnm-core-utils.h @@ -106,5 +106,6 @@ NMClientPermission nm_auth_permission_from_string (const char *str); /*****************************************************************************/ NMClientPermissionResult nm_client_permission_result_from_string (const char *nm); +const char *nm_client_permission_result_to_string (NMClientPermissionResult permission); #endif /* __NM_LIBNM_SHARED_UTILS_H__ */ From 466a4c45625a3726e45e219f5f9185a7dc0a3111 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 5 Dec 2019 14:55:28 +0100 Subject: [PATCH 050/109] core: don't duplicate list of known permissions in impl_manager_get_permissions() Reuse the list of all permissions and don't duplicate it. Also, now the result of GetPermissions() on D-Bus contains the permissions sorted by name. We get it almost for free, and it's a nice property. --- src/nm-manager.c | 77 +++++++++++++++--------------------------------- 1 file changed, 24 insertions(+), 53 deletions(-) diff --git a/src/nm-manager.c b/src/nm-manager.c index 8540a88f43..0adde3fc39 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -6198,31 +6198,13 @@ done: /* Permissions */ -static void -get_perm_add_result (NMManager *self, NMAuthChain *chain, GVariantBuilder *results, const char *permission) -{ - NMAuthCallResult result; - - result = nm_auth_chain_get_result (chain, permission); - if (result == NM_AUTH_CALL_RESULT_YES) - g_variant_builder_add (results, "{ss}", permission, "yes"); - else if (result == NM_AUTH_CALL_RESULT_NO) - g_variant_builder_add (results, "{ss}", permission, "no"); - else if (result == NM_AUTH_CALL_RESULT_AUTH) - g_variant_builder_add (results, "{ss}", permission, "auth"); - else if (result == NM_AUTH_CALL_RESULT_UNKNOWN) - g_variant_builder_add (results, "{ss}", permission, "unknown"); - else - nm_assert_not_reached (); -} - static void get_permissions_done_cb (NMAuthChain *chain, GDBusMethodInvocation *context, gpointer user_data) { - NMManager *self = NM_MANAGER (user_data); GVariantBuilder results; + int i; nm_assert (G_IS_DBUS_METHOD_INVOCATION (context)); @@ -6230,23 +6212,22 @@ get_permissions_done_cb (NMAuthChain *chain, g_variant_builder_init (&results, G_VARIANT_TYPE ("a{ss}")); - get_perm_add_result (self, chain, &results, NM_AUTH_PERMISSION_ENABLE_DISABLE_NETWORK); - get_perm_add_result (self, chain, &results, NM_AUTH_PERMISSION_SLEEP_WAKE); - get_perm_add_result (self, chain, &results, NM_AUTH_PERMISSION_ENABLE_DISABLE_WIFI); - get_perm_add_result (self, chain, &results, NM_AUTH_PERMISSION_ENABLE_DISABLE_WWAN); - get_perm_add_result (self, chain, &results, NM_AUTH_PERMISSION_ENABLE_DISABLE_WIMAX); - get_perm_add_result (self, chain, &results, NM_AUTH_PERMISSION_NETWORK_CONTROL); - get_perm_add_result (self, chain, &results, NM_AUTH_PERMISSION_WIFI_SHARE_PROTECTED); - get_perm_add_result (self, chain, &results, NM_AUTH_PERMISSION_WIFI_SHARE_OPEN); - get_perm_add_result (self, chain, &results, NM_AUTH_PERMISSION_SETTINGS_MODIFY_SYSTEM); - get_perm_add_result (self, chain, &results, NM_AUTH_PERMISSION_SETTINGS_MODIFY_OWN); - get_perm_add_result (self, chain, &results, NM_AUTH_PERMISSION_SETTINGS_MODIFY_HOSTNAME); - get_perm_add_result (self, chain, &results, NM_AUTH_PERMISSION_SETTINGS_MODIFY_GLOBAL_DNS); - get_perm_add_result (self, chain, &results, NM_AUTH_PERMISSION_RELOAD); - get_perm_add_result (self, chain, &results, NM_AUTH_PERMISSION_CHECKPOINT_ROLLBACK); - get_perm_add_result (self, chain, &results, NM_AUTH_PERMISSION_ENABLE_DISABLE_STATISTICS); - get_perm_add_result (self, chain, &results, NM_AUTH_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK); - get_perm_add_result (self, chain, &results, NM_AUTH_PERMISSION_WIFI_SCAN); + for (i = 0; i < (int) G_N_ELEMENTS (nm_auth_permission_sorted); i++) { + const char *permission = nm_auth_permission_names_by_idx[nm_auth_permission_sorted[i] - 1]; + NMAuthCallResult result; + + result = nm_auth_chain_get_result (chain, permission); + if (result == NM_AUTH_CALL_RESULT_YES) + g_variant_builder_add (&results, "{ss}", permission, "yes"); + else if (result == NM_AUTH_CALL_RESULT_NO) + g_variant_builder_add (&results, "{ss}", permission, "no"); + else if (result == NM_AUTH_CALL_RESULT_AUTH) + g_variant_builder_add (&results, "{ss}", permission, "auth"); + else if (result == NM_AUTH_CALL_RESULT_UNKNOWN) + g_variant_builder_add (&results, "{ss}", permission, "unknown"); + else + nm_assert_not_reached (); + } g_dbus_method_invocation_return_value (context, g_variant_new ("(a{ss})", &results)); @@ -6264,6 +6245,7 @@ impl_manager_get_permissions (NMDBusObject *obj, NMManager *self = NM_MANAGER (obj); NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self); NMAuthChain *chain; + int i; chain = nm_auth_chain_new_context (invocation, get_permissions_done_cb, self); if (!chain) { @@ -6275,23 +6257,12 @@ impl_manager_get_permissions (NMDBusObject *obj, } c_list_link_tail (&priv->auth_lst_head, nm_auth_chain_parent_lst_list (chain)); - nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_ENABLE_DISABLE_NETWORK, FALSE); - nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_SLEEP_WAKE, FALSE); - nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_ENABLE_DISABLE_WIFI, FALSE); - nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_ENABLE_DISABLE_WWAN, FALSE); - nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_ENABLE_DISABLE_WIMAX, FALSE); - nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, FALSE); - nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_WIFI_SHARE_PROTECTED, FALSE); - nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_WIFI_SHARE_OPEN, FALSE); - nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_SETTINGS_MODIFY_SYSTEM, FALSE); - nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_SETTINGS_MODIFY_OWN, FALSE); - nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_SETTINGS_MODIFY_HOSTNAME, FALSE); - nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_SETTINGS_MODIFY_GLOBAL_DNS, FALSE); - nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_RELOAD, FALSE); - nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_CHECKPOINT_ROLLBACK, FALSE); - nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_ENABLE_DISABLE_STATISTICS, FALSE); - nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK, FALSE); - nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_WIFI_SCAN, FALSE); + + for (i = 0; i < (int) G_N_ELEMENTS (nm_auth_permission_sorted); i++) { + const char *permission = nm_auth_permission_names_by_idx[nm_auth_permission_sorted[i] - 1]; + + nm_auth_chain_add_call_unsafe (chain, permission, FALSE); + } } static void From 33754752ea88f4717037801ee38652b392294efa Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 5 Dec 2019 15:20:18 +0100 Subject: [PATCH 051/109] core: use nm_client_permission_result_to_string() to map permission result In NetworkManager we have NMAuthCallResult, which is really a duplicate of NMClientPermissionResult. Maybe NMAuthCallResult should be entirely replaced by NMClientPermissionResult. But the name NMClientPermissionResult is a bit awkward. But then the duplication is even more awkward... fixing this is left for another day. --- src/nm-auth-manager.h | 14 ++++++++++---- src/nm-manager.c | 13 +++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/nm-auth-manager.h b/src/nm-auth-manager.h index 083f98aaaa..3e3124cacb 100644 --- a/src/nm-auth-manager.h +++ b/src/nm-auth-manager.h @@ -11,12 +11,18 @@ /*****************************************************************************/ typedef enum { - NM_AUTH_CALL_RESULT_UNKNOWN, - NM_AUTH_CALL_RESULT_YES, - NM_AUTH_CALL_RESULT_AUTH, - NM_AUTH_CALL_RESULT_NO, + NM_AUTH_CALL_RESULT_UNKNOWN = NM_CLIENT_PERMISSION_RESULT_UNKNOWN, + NM_AUTH_CALL_RESULT_YES = NM_CLIENT_PERMISSION_RESULT_YES, + NM_AUTH_CALL_RESULT_AUTH = NM_CLIENT_PERMISSION_RESULT_AUTH, + NM_AUTH_CALL_RESULT_NO = NM_CLIENT_PERMISSION_RESULT_NO, } NMAuthCallResult; +static inline NMClientPermissionResult +nm_auth_call_result_to_client (NMAuthCallResult result) +{ + return (NMClientPermissionResult) result; +} + static inline NMAuthCallResult nm_auth_call_result_eval (gboolean is_authorized, gboolean is_challenge, diff --git a/src/nm-manager.c b/src/nm-manager.c index 0adde3fc39..808c6538cf 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -6215,18 +6215,11 @@ get_permissions_done_cb (NMAuthChain *chain, for (i = 0; i < (int) G_N_ELEMENTS (nm_auth_permission_sorted); i++) { const char *permission = nm_auth_permission_names_by_idx[nm_auth_permission_sorted[i] - 1]; NMAuthCallResult result; + const char *result_str; result = nm_auth_chain_get_result (chain, permission); - if (result == NM_AUTH_CALL_RESULT_YES) - g_variant_builder_add (&results, "{ss}", permission, "yes"); - else if (result == NM_AUTH_CALL_RESULT_NO) - g_variant_builder_add (&results, "{ss}", permission, "no"); - else if (result == NM_AUTH_CALL_RESULT_AUTH) - g_variant_builder_add (&results, "{ss}", permission, "auth"); - else if (result == NM_AUTH_CALL_RESULT_UNKNOWN) - g_variant_builder_add (&results, "{ss}", permission, "unknown"); - else - nm_assert_not_reached (); + result_str = nm_client_permission_result_to_string (nm_auth_call_result_to_client (result)); + g_variant_builder_add (&results, "{ss}", permission, result_str); } g_dbus_method_invocation_return_value (context, From 89d55ad6e167ab89df98d2705605bc17a6ce13aa Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 6 Dec 2019 11:29:38 +0100 Subject: [PATCH 052/109] cli: sort permission in output of `nmcli general permissions` --- clients/cli/general.c | 11 +- .../test_001.expected | 1456 ++++++++--------- 2 files changed, 733 insertions(+), 734 deletions(-) diff --git a/clients/cli/general.c b/clients/cli/general.c index 8bf8ea2a13..da8437f0ed 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -510,18 +510,17 @@ print_permissions (void *user_data) NmCli *nmc = user_data; gs_free_error GError *error = NULL; const char *fields_str = NULL; - NMClientPermission perm; - guint i; - gpointer permissions[NM_CLIENT_PERMISSION_LAST + 1]; + gpointer permissions[G_N_ELEMENTS (nm_auth_permission_sorted) + 1]; + int i; if (!nmc->required_fields || strcasecmp (nmc->required_fields, "common") == 0) { } else if (strcasecmp (nmc->required_fields, "all") == 0) { } else fields_str = nmc->required_fields; - for (i = 0, perm = NM_CLIENT_PERMISSION_NONE + 1; perm <= NM_CLIENT_PERMISSION_LAST; perm++) - permissions[i++] = GINT_TO_POINTER (perm); - permissions[i++] = NULL; + for (i = 0; i < (int) G_N_ELEMENTS (nm_auth_permission_sorted); i++) + permissions[i] = GINT_TO_POINTER (nm_auth_permission_sorted[i]); + permissions[i] = NULL; nm_cli_spawn_pager (nmc); diff --git a/clients/tests/test-client.check-on-disk/test_001.expected b/clients/tests/test-client.check-on-disk/test_001.expected index a7439bf183..25d4437bff 100644 --- a/clients/tests/test-client.check-on-disk/test_001.expected +++ b/clients/tests/test-client.check-on-disk/test_001.expected @@ -100,23 +100,23 @@ returncode: 0 stdout: 1350 bytes >>> PERMISSION VALUE -org.freedesktop.NetworkManager.enable-disable-network yes -org.freedesktop.NetworkManager.enable-disable-wifi yes -org.freedesktop.NetworkManager.enable-disable-wwan yes -org.freedesktop.NetworkManager.enable-disable-wimax yes -org.freedesktop.NetworkManager.sleep-wake no -org.freedesktop.NetworkManager.network-control yes -org.freedesktop.NetworkManager.wifi.share.protected yes -org.freedesktop.NetworkManager.wifi.share.open yes -org.freedesktop.NetworkManager.settings.modify.system yes -org.freedesktop.NetworkManager.settings.modify.own yes -org.freedesktop.NetworkManager.settings.modify.hostname yes -org.freedesktop.NetworkManager.settings.modify.global-dns no -org.freedesktop.NetworkManager.reload no org.freedesktop.NetworkManager.checkpoint-rollback unknown -org.freedesktop.NetworkManager.enable-disable-statistics unknown org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown +org.freedesktop.NetworkManager.enable-disable-network yes +org.freedesktop.NetworkManager.enable-disable-statistics unknown +org.freedesktop.NetworkManager.enable-disable-wifi yes +org.freedesktop.NetworkManager.enable-disable-wimax yes +org.freedesktop.NetworkManager.enable-disable-wwan yes +org.freedesktop.NetworkManager.network-control yes +org.freedesktop.NetworkManager.reload no +org.freedesktop.NetworkManager.settings.modify.global-dns no +org.freedesktop.NetworkManager.settings.modify.hostname yes +org.freedesktop.NetworkManager.settings.modify.own yes +org.freedesktop.NetworkManager.settings.modify.system yes +org.freedesktop.NetworkManager.sleep-wake no org.freedesktop.NetworkManager.wifi.scan unknown +org.freedesktop.NetworkManager.wifi.share.open yes +org.freedesktop.NetworkManager.wifi.share.protected yes <<< size: 1513 @@ -127,23 +127,23 @@ returncode: 0 stdout: 1368 bytes >>> PERMISSION VALUE -org.freedesktop.NetworkManager.enable-disable-network tak -org.freedesktop.NetworkManager.enable-disable-wifi tak -org.freedesktop.NetworkManager.enable-disable-wwan tak -org.freedesktop.NetworkManager.enable-disable-wimax tak -org.freedesktop.NetworkManager.sleep-wake nie -org.freedesktop.NetworkManager.network-control tak -org.freedesktop.NetworkManager.wifi.share.protected tak -org.freedesktop.NetworkManager.wifi.share.open tak -org.freedesktop.NetworkManager.settings.modify.system tak -org.freedesktop.NetworkManager.settings.modify.own tak -org.freedesktop.NetworkManager.settings.modify.hostname tak -org.freedesktop.NetworkManager.settings.modify.global-dns nie -org.freedesktop.NetworkManager.reload nie org.freedesktop.NetworkManager.checkpoint-rollback nieznane -org.freedesktop.NetworkManager.enable-disable-statistics nieznane org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane +org.freedesktop.NetworkManager.enable-disable-network tak +org.freedesktop.NetworkManager.enable-disable-statistics nieznane +org.freedesktop.NetworkManager.enable-disable-wifi tak +org.freedesktop.NetworkManager.enable-disable-wimax tak +org.freedesktop.NetworkManager.enable-disable-wwan tak +org.freedesktop.NetworkManager.network-control tak +org.freedesktop.NetworkManager.reload nie +org.freedesktop.NetworkManager.settings.modify.global-dns nie +org.freedesktop.NetworkManager.settings.modify.hostname tak +org.freedesktop.NetworkManager.settings.modify.own tak +org.freedesktop.NetworkManager.settings.modify.system tak +org.freedesktop.NetworkManager.sleep-wake nie org.freedesktop.NetworkManager.wifi.scan nieznane +org.freedesktop.NetworkManager.wifi.share.open tak +org.freedesktop.NetworkManager.wifi.share.protected tak <<< size: 1614 @@ -154,23 +154,23 @@ returncode: 0 stdout: 1467 bytes >>> PERMISSION VALUE -org.freedesktop.NetworkManager.enable-disable-network yes -org.freedesktop.NetworkManager.enable-disable-wifi yes -org.freedesktop.NetworkManager.enable-disable-wwan yes -org.freedesktop.NetworkManager.enable-disable-wimax yes -org.freedesktop.NetworkManager.sleep-wake no -org.freedesktop.NetworkManager.network-control yes -org.freedesktop.NetworkManager.wifi.share.protected yes -org.freedesktop.NetworkManager.wifi.share.open yes -org.freedesktop.NetworkManager.settings.modify.system yes -org.freedesktop.NetworkManager.settings.modify.own yes -org.freedesktop.NetworkManager.settings.modify.hostname yes -org.freedesktop.NetworkManager.settings.modify.global-dns no -org.freedesktop.NetworkManager.reload no org.freedesktop.NetworkManager.checkpoint-rollback unknown -org.freedesktop.NetworkManager.enable-disable-statistics unknown org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown +org.freedesktop.NetworkManager.enable-disable-network yes +org.freedesktop.NetworkManager.enable-disable-statistics unknown +org.freedesktop.NetworkManager.enable-disable-wifi yes +org.freedesktop.NetworkManager.enable-disable-wimax yes +org.freedesktop.NetworkManager.enable-disable-wwan yes +org.freedesktop.NetworkManager.network-control yes +org.freedesktop.NetworkManager.reload no +org.freedesktop.NetworkManager.settings.modify.global-dns no +org.freedesktop.NetworkManager.settings.modify.hostname yes +org.freedesktop.NetworkManager.settings.modify.own yes +org.freedesktop.NetworkManager.settings.modify.system yes +org.freedesktop.NetworkManager.sleep-wake no org.freedesktop.NetworkManager.wifi.scan unknown +org.freedesktop.NetworkManager.wifi.share.open yes +org.freedesktop.NetworkManager.wifi.share.protected yes <<< size: 1642 @@ -181,23 +181,23 @@ returncode: 0 stdout: 1485 bytes >>> PERMISSION VALUE -org.freedesktop.NetworkManager.enable-disable-network tak -org.freedesktop.NetworkManager.enable-disable-wifi tak -org.freedesktop.NetworkManager.enable-disable-wwan tak -org.freedesktop.NetworkManager.enable-disable-wimax tak -org.freedesktop.NetworkManager.sleep-wake nie -org.freedesktop.NetworkManager.network-control tak -org.freedesktop.NetworkManager.wifi.share.protected tak -org.freedesktop.NetworkManager.wifi.share.open tak -org.freedesktop.NetworkManager.settings.modify.system tak -org.freedesktop.NetworkManager.settings.modify.own tak -org.freedesktop.NetworkManager.settings.modify.hostname tak -org.freedesktop.NetworkManager.settings.modify.global-dns nie -org.freedesktop.NetworkManager.reload nie org.freedesktop.NetworkManager.checkpoint-rollback nieznane -org.freedesktop.NetworkManager.enable-disable-statistics nieznane org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane +org.freedesktop.NetworkManager.enable-disable-network tak +org.freedesktop.NetworkManager.enable-disable-statistics nieznane +org.freedesktop.NetworkManager.enable-disable-wifi tak +org.freedesktop.NetworkManager.enable-disable-wimax tak +org.freedesktop.NetworkManager.enable-disable-wwan tak +org.freedesktop.NetworkManager.network-control tak +org.freedesktop.NetworkManager.reload nie +org.freedesktop.NetworkManager.settings.modify.global-dns nie +org.freedesktop.NetworkManager.settings.modify.hostname tak +org.freedesktop.NetworkManager.settings.modify.own tak +org.freedesktop.NetworkManager.settings.modify.system tak +org.freedesktop.NetworkManager.sleep-wake nie org.freedesktop.NetworkManager.wifi.scan nieznane +org.freedesktop.NetworkManager.wifi.share.open tak +org.freedesktop.NetworkManager.wifi.share.protected tak <<< size: 1691 @@ -212,23 +212,23 @@ stdout: 1547 bytes ============================== PERMISSION VALUE --------------------------------------------------------------------------------------------------------- -org.freedesktop.NetworkManager.enable-disable-network yes -org.freedesktop.NetworkManager.enable-disable-wifi yes -org.freedesktop.NetworkManager.enable-disable-wwan yes -org.freedesktop.NetworkManager.enable-disable-wimax yes -org.freedesktop.NetworkManager.sleep-wake no -org.freedesktop.NetworkManager.network-control yes -org.freedesktop.NetworkManager.wifi.share.protected yes -org.freedesktop.NetworkManager.wifi.share.open yes -org.freedesktop.NetworkManager.settings.modify.system yes -org.freedesktop.NetworkManager.settings.modify.own yes -org.freedesktop.NetworkManager.settings.modify.hostname yes -org.freedesktop.NetworkManager.settings.modify.global-dns no -org.freedesktop.NetworkManager.reload no org.freedesktop.NetworkManager.checkpoint-rollback unknown -org.freedesktop.NetworkManager.enable-disable-statistics unknown org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown +org.freedesktop.NetworkManager.enable-disable-network yes +org.freedesktop.NetworkManager.enable-disable-statistics unknown +org.freedesktop.NetworkManager.enable-disable-wifi yes +org.freedesktop.NetworkManager.enable-disable-wimax yes +org.freedesktop.NetworkManager.enable-disable-wwan yes +org.freedesktop.NetworkManager.network-control yes +org.freedesktop.NetworkManager.reload no +org.freedesktop.NetworkManager.settings.modify.global-dns no +org.freedesktop.NetworkManager.settings.modify.hostname yes +org.freedesktop.NetworkManager.settings.modify.own yes +org.freedesktop.NetworkManager.settings.modify.system yes +org.freedesktop.NetworkManager.sleep-wake no org.freedesktop.NetworkManager.wifi.scan unknown +org.freedesktop.NetworkManager.wifi.share.open yes +org.freedesktop.NetworkManager.wifi.share.protected yes <<< size: 1749 @@ -243,23 +243,23 @@ stdout: 1595 bytes ===================================== PERMISSION VALUE ----------------------------------------------------------------------------------------------------------------- -org.freedesktop.NetworkManager.enable-disable-network tak -org.freedesktop.NetworkManager.enable-disable-wifi tak -org.freedesktop.NetworkManager.enable-disable-wwan tak -org.freedesktop.NetworkManager.enable-disable-wimax tak -org.freedesktop.NetworkManager.sleep-wake nie -org.freedesktop.NetworkManager.network-control tak -org.freedesktop.NetworkManager.wifi.share.protected tak -org.freedesktop.NetworkManager.wifi.share.open tak -org.freedesktop.NetworkManager.settings.modify.system tak -org.freedesktop.NetworkManager.settings.modify.own tak -org.freedesktop.NetworkManager.settings.modify.hostname tak -org.freedesktop.NetworkManager.settings.modify.global-dns nie -org.freedesktop.NetworkManager.reload nie org.freedesktop.NetworkManager.checkpoint-rollback nieznane -org.freedesktop.NetworkManager.enable-disable-statistics nieznane org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane +org.freedesktop.NetworkManager.enable-disable-network tak +org.freedesktop.NetworkManager.enable-disable-statistics nieznane +org.freedesktop.NetworkManager.enable-disable-wifi tak +org.freedesktop.NetworkManager.enable-disable-wimax tak +org.freedesktop.NetworkManager.enable-disable-wwan tak +org.freedesktop.NetworkManager.network-control tak +org.freedesktop.NetworkManager.reload nie +org.freedesktop.NetworkManager.settings.modify.global-dns nie +org.freedesktop.NetworkManager.settings.modify.hostname tak +org.freedesktop.NetworkManager.settings.modify.own tak +org.freedesktop.NetworkManager.settings.modify.system tak +org.freedesktop.NetworkManager.sleep-wake nie org.freedesktop.NetworkManager.wifi.scan nieznane +org.freedesktop.NetworkManager.wifi.share.open tak +org.freedesktop.NetworkManager.wifi.share.protected tak <<< size: 1820 @@ -274,23 +274,23 @@ stdout: 1664 bytes ============================== PERMISSION VALUE --------------------------------------------------------------------------------------------------------- -org.freedesktop.NetworkManager.enable-disable-network yes -org.freedesktop.NetworkManager.enable-disable-wifi yes -org.freedesktop.NetworkManager.enable-disable-wwan yes -org.freedesktop.NetworkManager.enable-disable-wimax yes -org.freedesktop.NetworkManager.sleep-wake no -org.freedesktop.NetworkManager.network-control yes -org.freedesktop.NetworkManager.wifi.share.protected yes -org.freedesktop.NetworkManager.wifi.share.open yes -org.freedesktop.NetworkManager.settings.modify.system yes -org.freedesktop.NetworkManager.settings.modify.own yes -org.freedesktop.NetworkManager.settings.modify.hostname yes -org.freedesktop.NetworkManager.settings.modify.global-dns no -org.freedesktop.NetworkManager.reload no org.freedesktop.NetworkManager.checkpoint-rollback unknown -org.freedesktop.NetworkManager.enable-disable-statistics unknown org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown +org.freedesktop.NetworkManager.enable-disable-network yes +org.freedesktop.NetworkManager.enable-disable-statistics unknown +org.freedesktop.NetworkManager.enable-disable-wifi yes +org.freedesktop.NetworkManager.enable-disable-wimax yes +org.freedesktop.NetworkManager.enable-disable-wwan yes +org.freedesktop.NetworkManager.network-control yes +org.freedesktop.NetworkManager.reload no +org.freedesktop.NetworkManager.settings.modify.global-dns no +org.freedesktop.NetworkManager.settings.modify.hostname yes +org.freedesktop.NetworkManager.settings.modify.own yes +org.freedesktop.NetworkManager.settings.modify.system yes +org.freedesktop.NetworkManager.sleep-wake no org.freedesktop.NetworkManager.wifi.scan unknown +org.freedesktop.NetworkManager.wifi.share.open yes +org.freedesktop.NetworkManager.wifi.share.protected yes <<< size: 1878 @@ -305,23 +305,23 @@ stdout: 1712 bytes ===================================== PERMISSION VALUE ----------------------------------------------------------------------------------------------------------------- -org.freedesktop.NetworkManager.enable-disable-network tak -org.freedesktop.NetworkManager.enable-disable-wifi tak -org.freedesktop.NetworkManager.enable-disable-wwan tak -org.freedesktop.NetworkManager.enable-disable-wimax tak -org.freedesktop.NetworkManager.sleep-wake nie -org.freedesktop.NetworkManager.network-control tak -org.freedesktop.NetworkManager.wifi.share.protected tak -org.freedesktop.NetworkManager.wifi.share.open tak -org.freedesktop.NetworkManager.settings.modify.system tak -org.freedesktop.NetworkManager.settings.modify.own tak -org.freedesktop.NetworkManager.settings.modify.hostname tak -org.freedesktop.NetworkManager.settings.modify.global-dns nie -org.freedesktop.NetworkManager.reload nie org.freedesktop.NetworkManager.checkpoint-rollback nieznane -org.freedesktop.NetworkManager.enable-disable-statistics nieznane org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane +org.freedesktop.NetworkManager.enable-disable-network tak +org.freedesktop.NetworkManager.enable-disable-statistics nieznane +org.freedesktop.NetworkManager.enable-disable-wifi tak +org.freedesktop.NetworkManager.enable-disable-wimax tak +org.freedesktop.NetworkManager.enable-disable-wwan tak +org.freedesktop.NetworkManager.network-control tak +org.freedesktop.NetworkManager.reload nie +org.freedesktop.NetworkManager.settings.modify.global-dns nie +org.freedesktop.NetworkManager.settings.modify.hostname tak +org.freedesktop.NetworkManager.settings.modify.own tak +org.freedesktop.NetworkManager.settings.modify.system tak +org.freedesktop.NetworkManager.sleep-wake nie org.freedesktop.NetworkManager.wifi.scan nieznane +org.freedesktop.NetworkManager.wifi.share.open tak +org.freedesktop.NetworkManager.wifi.share.protected tak <<< size: 1090 @@ -331,23 +331,23 @@ lang: C returncode: 0 stdout: 948 bytes >>> -org.freedesktop.NetworkManager.enable-disable-network:yes -org.freedesktop.NetworkManager.enable-disable-wifi:yes -org.freedesktop.NetworkManager.enable-disable-wwan:yes -org.freedesktop.NetworkManager.enable-disable-wimax:yes -org.freedesktop.NetworkManager.sleep-wake:no -org.freedesktop.NetworkManager.network-control:yes -org.freedesktop.NetworkManager.wifi.share.protected:yes -org.freedesktop.NetworkManager.wifi.share.open:yes -org.freedesktop.NetworkManager.settings.modify.system:yes -org.freedesktop.NetworkManager.settings.modify.own:yes -org.freedesktop.NetworkManager.settings.modify.hostname:yes -org.freedesktop.NetworkManager.settings.modify.global-dns:no -org.freedesktop.NetworkManager.reload:no org.freedesktop.NetworkManager.checkpoint-rollback:unknown -org.freedesktop.NetworkManager.enable-disable-statistics:unknown org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown +org.freedesktop.NetworkManager.enable-disable-network:yes +org.freedesktop.NetworkManager.enable-disable-statistics:unknown +org.freedesktop.NetworkManager.enable-disable-wifi:yes +org.freedesktop.NetworkManager.enable-disable-wimax:yes +org.freedesktop.NetworkManager.enable-disable-wwan:yes +org.freedesktop.NetworkManager.network-control:yes +org.freedesktop.NetworkManager.reload:no +org.freedesktop.NetworkManager.settings.modify.global-dns:no +org.freedesktop.NetworkManager.settings.modify.hostname:yes +org.freedesktop.NetworkManager.settings.modify.own:yes +org.freedesktop.NetworkManager.settings.modify.system:yes +org.freedesktop.NetworkManager.sleep-wake:no org.freedesktop.NetworkManager.wifi.scan:unknown +org.freedesktop.NetworkManager.wifi.share.open:yes +org.freedesktop.NetworkManager.wifi.share.protected:yes <<< size: 1100 @@ -357,23 +357,23 @@ lang: pl_PL.UTF-8 returncode: 0 stdout: 948 bytes >>> -org.freedesktop.NetworkManager.enable-disable-network:yes -org.freedesktop.NetworkManager.enable-disable-wifi:yes -org.freedesktop.NetworkManager.enable-disable-wwan:yes -org.freedesktop.NetworkManager.enable-disable-wimax:yes -org.freedesktop.NetworkManager.sleep-wake:no -org.freedesktop.NetworkManager.network-control:yes -org.freedesktop.NetworkManager.wifi.share.protected:yes -org.freedesktop.NetworkManager.wifi.share.open:yes -org.freedesktop.NetworkManager.settings.modify.system:yes -org.freedesktop.NetworkManager.settings.modify.own:yes -org.freedesktop.NetworkManager.settings.modify.hostname:yes -org.freedesktop.NetworkManager.settings.modify.global-dns:no -org.freedesktop.NetworkManager.reload:no org.freedesktop.NetworkManager.checkpoint-rollback:unknown -org.freedesktop.NetworkManager.enable-disable-statistics:unknown org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown +org.freedesktop.NetworkManager.enable-disable-network:yes +org.freedesktop.NetworkManager.enable-disable-statistics:unknown +org.freedesktop.NetworkManager.enable-disable-wifi:yes +org.freedesktop.NetworkManager.enable-disable-wimax:yes +org.freedesktop.NetworkManager.enable-disable-wwan:yes +org.freedesktop.NetworkManager.network-control:yes +org.freedesktop.NetworkManager.reload:no +org.freedesktop.NetworkManager.settings.modify.global-dns:no +org.freedesktop.NetworkManager.settings.modify.hostname:yes +org.freedesktop.NetworkManager.settings.modify.own:yes +org.freedesktop.NetworkManager.settings.modify.system:yes +org.freedesktop.NetworkManager.sleep-wake:no org.freedesktop.NetworkManager.wifi.scan:unknown +org.freedesktop.NetworkManager.wifi.share.open:yes +org.freedesktop.NetworkManager.wifi.share.protected:yes <<< size: 1220 @@ -383,23 +383,23 @@ lang: C returncode: 0 stdout: 1065 bytes >>> -org.freedesktop.NetworkManager.enable-disable-network:yes -org.freedesktop.NetworkManager.enable-disable-wifi:yes -org.freedesktop.NetworkManager.enable-disable-wwan:yes -org.freedesktop.NetworkManager.enable-disable-wimax:yes -org.freedesktop.NetworkManager.sleep-wake:no -org.freedesktop.NetworkManager.network-control:yes -org.freedesktop.NetworkManager.wifi.share.protected:yes -org.freedesktop.NetworkManager.wifi.share.open:yes -org.freedesktop.NetworkManager.settings.modify.system:yes -org.freedesktop.NetworkManager.settings.modify.own:yes -org.freedesktop.NetworkManager.settings.modify.hostname:yes -org.freedesktop.NetworkManager.settings.modify.global-dns:no -org.freedesktop.NetworkManager.reload:no org.freedesktop.NetworkManager.checkpoint-rollback:unknown -org.freedesktop.NetworkManager.enable-disable-statistics:unknown org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown +org.freedesktop.NetworkManager.enable-disable-network:yes +org.freedesktop.NetworkManager.enable-disable-statistics:unknown +org.freedesktop.NetworkManager.enable-disable-wifi:yes +org.freedesktop.NetworkManager.enable-disable-wimax:yes +org.freedesktop.NetworkManager.enable-disable-wwan:yes +org.freedesktop.NetworkManager.network-control:yes +org.freedesktop.NetworkManager.reload:no +org.freedesktop.NetworkManager.settings.modify.global-dns:no +org.freedesktop.NetworkManager.settings.modify.hostname:yes +org.freedesktop.NetworkManager.settings.modify.own:yes +org.freedesktop.NetworkManager.settings.modify.system:yes +org.freedesktop.NetworkManager.sleep-wake:no org.freedesktop.NetworkManager.wifi.scan:unknown +org.freedesktop.NetworkManager.wifi.share.open:yes +org.freedesktop.NetworkManager.wifi.share.protected:yes <<< size: 1230 @@ -409,23 +409,23 @@ lang: pl_PL.UTF-8 returncode: 0 stdout: 1065 bytes >>> -org.freedesktop.NetworkManager.enable-disable-network:yes -org.freedesktop.NetworkManager.enable-disable-wifi:yes -org.freedesktop.NetworkManager.enable-disable-wwan:yes -org.freedesktop.NetworkManager.enable-disable-wimax:yes -org.freedesktop.NetworkManager.sleep-wake:no -org.freedesktop.NetworkManager.network-control:yes -org.freedesktop.NetworkManager.wifi.share.protected:yes -org.freedesktop.NetworkManager.wifi.share.open:yes -org.freedesktop.NetworkManager.settings.modify.system:yes -org.freedesktop.NetworkManager.settings.modify.own:yes -org.freedesktop.NetworkManager.settings.modify.hostname:yes -org.freedesktop.NetworkManager.settings.modify.global-dns:no -org.freedesktop.NetworkManager.reload:no org.freedesktop.NetworkManager.checkpoint-rollback:unknown -org.freedesktop.NetworkManager.enable-disable-statistics:unknown org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown +org.freedesktop.NetworkManager.enable-disable-network:yes +org.freedesktop.NetworkManager.enable-disable-statistics:unknown +org.freedesktop.NetworkManager.enable-disable-wifi:yes +org.freedesktop.NetworkManager.enable-disable-wimax:yes +org.freedesktop.NetworkManager.enable-disable-wwan:yes +org.freedesktop.NetworkManager.network-control:yes +org.freedesktop.NetworkManager.reload:no +org.freedesktop.NetworkManager.settings.modify.global-dns:no +org.freedesktop.NetworkManager.settings.modify.hostname:yes +org.freedesktop.NetworkManager.settings.modify.own:yes +org.freedesktop.NetworkManager.settings.modify.system:yes +org.freedesktop.NetworkManager.sleep-wake:no org.freedesktop.NetworkManager.wifi.scan:unknown +org.freedesktop.NetworkManager.wifi.share.open:yes +org.freedesktop.NetworkManager.wifi.share.protected:yes <<< size: 1500 @@ -436,23 +436,23 @@ returncode: 0 stdout: 1350 bytes >>> PERMISSION VALUE -org.freedesktop.NetworkManager.enable-disable-network yes -org.freedesktop.NetworkManager.enable-disable-wifi yes -org.freedesktop.NetworkManager.enable-disable-wwan yes -org.freedesktop.NetworkManager.enable-disable-wimax yes -org.freedesktop.NetworkManager.sleep-wake no -org.freedesktop.NetworkManager.network-control yes -org.freedesktop.NetworkManager.wifi.share.protected yes -org.freedesktop.NetworkManager.wifi.share.open yes -org.freedesktop.NetworkManager.settings.modify.system yes -org.freedesktop.NetworkManager.settings.modify.own yes -org.freedesktop.NetworkManager.settings.modify.hostname yes -org.freedesktop.NetworkManager.settings.modify.global-dns no -org.freedesktop.NetworkManager.reload no org.freedesktop.NetworkManager.checkpoint-rollback unknown -org.freedesktop.NetworkManager.enable-disable-statistics unknown org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown +org.freedesktop.NetworkManager.enable-disable-network yes +org.freedesktop.NetworkManager.enable-disable-statistics unknown +org.freedesktop.NetworkManager.enable-disable-wifi yes +org.freedesktop.NetworkManager.enable-disable-wimax yes +org.freedesktop.NetworkManager.enable-disable-wwan yes +org.freedesktop.NetworkManager.network-control yes +org.freedesktop.NetworkManager.reload no +org.freedesktop.NetworkManager.settings.modify.global-dns no +org.freedesktop.NetworkManager.settings.modify.hostname yes +org.freedesktop.NetworkManager.settings.modify.own yes +org.freedesktop.NetworkManager.settings.modify.system yes +org.freedesktop.NetworkManager.sleep-wake no org.freedesktop.NetworkManager.wifi.scan unknown +org.freedesktop.NetworkManager.wifi.share.open yes +org.freedesktop.NetworkManager.wifi.share.protected yes <<< size: 1528 @@ -463,23 +463,23 @@ returncode: 0 stdout: 1368 bytes >>> PERMISSION VALUE -org.freedesktop.NetworkManager.enable-disable-network tak -org.freedesktop.NetworkManager.enable-disable-wifi tak -org.freedesktop.NetworkManager.enable-disable-wwan tak -org.freedesktop.NetworkManager.enable-disable-wimax tak -org.freedesktop.NetworkManager.sleep-wake nie -org.freedesktop.NetworkManager.network-control tak -org.freedesktop.NetworkManager.wifi.share.protected tak -org.freedesktop.NetworkManager.wifi.share.open tak -org.freedesktop.NetworkManager.settings.modify.system tak -org.freedesktop.NetworkManager.settings.modify.own tak -org.freedesktop.NetworkManager.settings.modify.hostname tak -org.freedesktop.NetworkManager.settings.modify.global-dns nie -org.freedesktop.NetworkManager.reload nie org.freedesktop.NetworkManager.checkpoint-rollback nieznane -org.freedesktop.NetworkManager.enable-disable-statistics nieznane org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane +org.freedesktop.NetworkManager.enable-disable-network tak +org.freedesktop.NetworkManager.enable-disable-statistics nieznane +org.freedesktop.NetworkManager.enable-disable-wifi tak +org.freedesktop.NetworkManager.enable-disable-wimax tak +org.freedesktop.NetworkManager.enable-disable-wwan tak +org.freedesktop.NetworkManager.network-control tak +org.freedesktop.NetworkManager.reload nie +org.freedesktop.NetworkManager.settings.modify.global-dns nie +org.freedesktop.NetworkManager.settings.modify.hostname tak +org.freedesktop.NetworkManager.settings.modify.own tak +org.freedesktop.NetworkManager.settings.modify.system tak +org.freedesktop.NetworkManager.sleep-wake nie org.freedesktop.NetworkManager.wifi.scan nieznane +org.freedesktop.NetworkManager.wifi.share.open tak +org.freedesktop.NetworkManager.wifi.share.protected tak <<< size: 1629 @@ -490,23 +490,23 @@ returncode: 0 stdout: 1467 bytes >>> PERMISSION VALUE -org.freedesktop.NetworkManager.enable-disable-network yes -org.freedesktop.NetworkManager.enable-disable-wifi yes -org.freedesktop.NetworkManager.enable-disable-wwan yes -org.freedesktop.NetworkManager.enable-disable-wimax yes -org.freedesktop.NetworkManager.sleep-wake no -org.freedesktop.NetworkManager.network-control yes -org.freedesktop.NetworkManager.wifi.share.protected yes -org.freedesktop.NetworkManager.wifi.share.open yes -org.freedesktop.NetworkManager.settings.modify.system yes -org.freedesktop.NetworkManager.settings.modify.own yes -org.freedesktop.NetworkManager.settings.modify.hostname yes -org.freedesktop.NetworkManager.settings.modify.global-dns no -org.freedesktop.NetworkManager.reload no org.freedesktop.NetworkManager.checkpoint-rollback unknown -org.freedesktop.NetworkManager.enable-disable-statistics unknown org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown +org.freedesktop.NetworkManager.enable-disable-network yes +org.freedesktop.NetworkManager.enable-disable-statistics unknown +org.freedesktop.NetworkManager.enable-disable-wifi yes +org.freedesktop.NetworkManager.enable-disable-wimax yes +org.freedesktop.NetworkManager.enable-disable-wwan yes +org.freedesktop.NetworkManager.network-control yes +org.freedesktop.NetworkManager.reload no +org.freedesktop.NetworkManager.settings.modify.global-dns no +org.freedesktop.NetworkManager.settings.modify.hostname yes +org.freedesktop.NetworkManager.settings.modify.own yes +org.freedesktop.NetworkManager.settings.modify.system yes +org.freedesktop.NetworkManager.sleep-wake no org.freedesktop.NetworkManager.wifi.scan unknown +org.freedesktop.NetworkManager.wifi.share.open yes +org.freedesktop.NetworkManager.wifi.share.protected yes <<< size: 1657 @@ -517,23 +517,23 @@ returncode: 0 stdout: 1485 bytes >>> PERMISSION VALUE -org.freedesktop.NetworkManager.enable-disable-network tak -org.freedesktop.NetworkManager.enable-disable-wifi tak -org.freedesktop.NetworkManager.enable-disable-wwan tak -org.freedesktop.NetworkManager.enable-disable-wimax tak -org.freedesktop.NetworkManager.sleep-wake nie -org.freedesktop.NetworkManager.network-control tak -org.freedesktop.NetworkManager.wifi.share.protected tak -org.freedesktop.NetworkManager.wifi.share.open tak -org.freedesktop.NetworkManager.settings.modify.system tak -org.freedesktop.NetworkManager.settings.modify.own tak -org.freedesktop.NetworkManager.settings.modify.hostname tak -org.freedesktop.NetworkManager.settings.modify.global-dns nie -org.freedesktop.NetworkManager.reload nie org.freedesktop.NetworkManager.checkpoint-rollback nieznane -org.freedesktop.NetworkManager.enable-disable-statistics nieznane org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane +org.freedesktop.NetworkManager.enable-disable-network tak +org.freedesktop.NetworkManager.enable-disable-statistics nieznane +org.freedesktop.NetworkManager.enable-disable-wifi tak +org.freedesktop.NetworkManager.enable-disable-wimax tak +org.freedesktop.NetworkManager.enable-disable-wwan tak +org.freedesktop.NetworkManager.network-control tak +org.freedesktop.NetworkManager.reload nie +org.freedesktop.NetworkManager.settings.modify.global-dns nie +org.freedesktop.NetworkManager.settings.modify.hostname tak +org.freedesktop.NetworkManager.settings.modify.own tak +org.freedesktop.NetworkManager.settings.modify.system tak +org.freedesktop.NetworkManager.sleep-wake nie org.freedesktop.NetworkManager.wifi.scan nieznane +org.freedesktop.NetworkManager.wifi.share.open tak +org.freedesktop.NetworkManager.wifi.share.protected tak <<< size: 1706 @@ -548,23 +548,23 @@ stdout: 1547 bytes ============================== PERMISSION VALUE --------------------------------------------------------------------------------------------------------- -org.freedesktop.NetworkManager.enable-disable-network yes -org.freedesktop.NetworkManager.enable-disable-wifi yes -org.freedesktop.NetworkManager.enable-disable-wwan yes -org.freedesktop.NetworkManager.enable-disable-wimax yes -org.freedesktop.NetworkManager.sleep-wake no -org.freedesktop.NetworkManager.network-control yes -org.freedesktop.NetworkManager.wifi.share.protected yes -org.freedesktop.NetworkManager.wifi.share.open yes -org.freedesktop.NetworkManager.settings.modify.system yes -org.freedesktop.NetworkManager.settings.modify.own yes -org.freedesktop.NetworkManager.settings.modify.hostname yes -org.freedesktop.NetworkManager.settings.modify.global-dns no -org.freedesktop.NetworkManager.reload no org.freedesktop.NetworkManager.checkpoint-rollback unknown -org.freedesktop.NetworkManager.enable-disable-statistics unknown org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown +org.freedesktop.NetworkManager.enable-disable-network yes +org.freedesktop.NetworkManager.enable-disable-statistics unknown +org.freedesktop.NetworkManager.enable-disable-wifi yes +org.freedesktop.NetworkManager.enable-disable-wimax yes +org.freedesktop.NetworkManager.enable-disable-wwan yes +org.freedesktop.NetworkManager.network-control yes +org.freedesktop.NetworkManager.reload no +org.freedesktop.NetworkManager.settings.modify.global-dns no +org.freedesktop.NetworkManager.settings.modify.hostname yes +org.freedesktop.NetworkManager.settings.modify.own yes +org.freedesktop.NetworkManager.settings.modify.system yes +org.freedesktop.NetworkManager.sleep-wake no org.freedesktop.NetworkManager.wifi.scan unknown +org.freedesktop.NetworkManager.wifi.share.open yes +org.freedesktop.NetworkManager.wifi.share.protected yes <<< size: 1764 @@ -579,23 +579,23 @@ stdout: 1595 bytes ===================================== PERMISSION VALUE ----------------------------------------------------------------------------------------------------------------- -org.freedesktop.NetworkManager.enable-disable-network tak -org.freedesktop.NetworkManager.enable-disable-wifi tak -org.freedesktop.NetworkManager.enable-disable-wwan tak -org.freedesktop.NetworkManager.enable-disable-wimax tak -org.freedesktop.NetworkManager.sleep-wake nie -org.freedesktop.NetworkManager.network-control tak -org.freedesktop.NetworkManager.wifi.share.protected tak -org.freedesktop.NetworkManager.wifi.share.open tak -org.freedesktop.NetworkManager.settings.modify.system tak -org.freedesktop.NetworkManager.settings.modify.own tak -org.freedesktop.NetworkManager.settings.modify.hostname tak -org.freedesktop.NetworkManager.settings.modify.global-dns nie -org.freedesktop.NetworkManager.reload nie org.freedesktop.NetworkManager.checkpoint-rollback nieznane -org.freedesktop.NetworkManager.enable-disable-statistics nieznane org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane +org.freedesktop.NetworkManager.enable-disable-network tak +org.freedesktop.NetworkManager.enable-disable-statistics nieznane +org.freedesktop.NetworkManager.enable-disable-wifi tak +org.freedesktop.NetworkManager.enable-disable-wimax tak +org.freedesktop.NetworkManager.enable-disable-wwan tak +org.freedesktop.NetworkManager.network-control tak +org.freedesktop.NetworkManager.reload nie +org.freedesktop.NetworkManager.settings.modify.global-dns nie +org.freedesktop.NetworkManager.settings.modify.hostname tak +org.freedesktop.NetworkManager.settings.modify.own tak +org.freedesktop.NetworkManager.settings.modify.system tak +org.freedesktop.NetworkManager.sleep-wake nie org.freedesktop.NetworkManager.wifi.scan nieznane +org.freedesktop.NetworkManager.wifi.share.open tak +org.freedesktop.NetworkManager.wifi.share.protected tak <<< size: 1835 @@ -610,23 +610,23 @@ stdout: 1664 bytes ============================== PERMISSION VALUE --------------------------------------------------------------------------------------------------------- -org.freedesktop.NetworkManager.enable-disable-network yes -org.freedesktop.NetworkManager.enable-disable-wifi yes -org.freedesktop.NetworkManager.enable-disable-wwan yes -org.freedesktop.NetworkManager.enable-disable-wimax yes -org.freedesktop.NetworkManager.sleep-wake no -org.freedesktop.NetworkManager.network-control yes -org.freedesktop.NetworkManager.wifi.share.protected yes -org.freedesktop.NetworkManager.wifi.share.open yes -org.freedesktop.NetworkManager.settings.modify.system yes -org.freedesktop.NetworkManager.settings.modify.own yes -org.freedesktop.NetworkManager.settings.modify.hostname yes -org.freedesktop.NetworkManager.settings.modify.global-dns no -org.freedesktop.NetworkManager.reload no org.freedesktop.NetworkManager.checkpoint-rollback unknown -org.freedesktop.NetworkManager.enable-disable-statistics unknown org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown +org.freedesktop.NetworkManager.enable-disable-network yes +org.freedesktop.NetworkManager.enable-disable-statistics unknown +org.freedesktop.NetworkManager.enable-disable-wifi yes +org.freedesktop.NetworkManager.enable-disable-wimax yes +org.freedesktop.NetworkManager.enable-disable-wwan yes +org.freedesktop.NetworkManager.network-control yes +org.freedesktop.NetworkManager.reload no +org.freedesktop.NetworkManager.settings.modify.global-dns no +org.freedesktop.NetworkManager.settings.modify.hostname yes +org.freedesktop.NetworkManager.settings.modify.own yes +org.freedesktop.NetworkManager.settings.modify.system yes +org.freedesktop.NetworkManager.sleep-wake no org.freedesktop.NetworkManager.wifi.scan unknown +org.freedesktop.NetworkManager.wifi.share.open yes +org.freedesktop.NetworkManager.wifi.share.protected yes <<< size: 1893 @@ -641,23 +641,23 @@ stdout: 1712 bytes ===================================== PERMISSION VALUE ----------------------------------------------------------------------------------------------------------------- -org.freedesktop.NetworkManager.enable-disable-network tak -org.freedesktop.NetworkManager.enable-disable-wifi tak -org.freedesktop.NetworkManager.enable-disable-wwan tak -org.freedesktop.NetworkManager.enable-disable-wimax tak -org.freedesktop.NetworkManager.sleep-wake nie -org.freedesktop.NetworkManager.network-control tak -org.freedesktop.NetworkManager.wifi.share.protected tak -org.freedesktop.NetworkManager.wifi.share.open tak -org.freedesktop.NetworkManager.settings.modify.system tak -org.freedesktop.NetworkManager.settings.modify.own tak -org.freedesktop.NetworkManager.settings.modify.hostname tak -org.freedesktop.NetworkManager.settings.modify.global-dns nie -org.freedesktop.NetworkManager.reload nie org.freedesktop.NetworkManager.checkpoint-rollback nieznane -org.freedesktop.NetworkManager.enable-disable-statistics nieznane org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane +org.freedesktop.NetworkManager.enable-disable-network tak +org.freedesktop.NetworkManager.enable-disable-statistics nieznane +org.freedesktop.NetworkManager.enable-disable-wifi tak +org.freedesktop.NetworkManager.enable-disable-wimax tak +org.freedesktop.NetworkManager.enable-disable-wwan tak +org.freedesktop.NetworkManager.network-control tak +org.freedesktop.NetworkManager.reload nie +org.freedesktop.NetworkManager.settings.modify.global-dns nie +org.freedesktop.NetworkManager.settings.modify.hostname tak +org.freedesktop.NetworkManager.settings.modify.own tak +org.freedesktop.NetworkManager.settings.modify.system tak +org.freedesktop.NetworkManager.sleep-wake nie org.freedesktop.NetworkManager.wifi.scan nieznane +org.freedesktop.NetworkManager.wifi.share.open tak +org.freedesktop.NetworkManager.wifi.share.protected tak <<< size: 1105 @@ -667,23 +667,23 @@ lang: C returncode: 0 stdout: 948 bytes >>> -org.freedesktop.NetworkManager.enable-disable-network:yes -org.freedesktop.NetworkManager.enable-disable-wifi:yes -org.freedesktop.NetworkManager.enable-disable-wwan:yes -org.freedesktop.NetworkManager.enable-disable-wimax:yes -org.freedesktop.NetworkManager.sleep-wake:no -org.freedesktop.NetworkManager.network-control:yes -org.freedesktop.NetworkManager.wifi.share.protected:yes -org.freedesktop.NetworkManager.wifi.share.open:yes -org.freedesktop.NetworkManager.settings.modify.system:yes -org.freedesktop.NetworkManager.settings.modify.own:yes -org.freedesktop.NetworkManager.settings.modify.hostname:yes -org.freedesktop.NetworkManager.settings.modify.global-dns:no -org.freedesktop.NetworkManager.reload:no org.freedesktop.NetworkManager.checkpoint-rollback:unknown -org.freedesktop.NetworkManager.enable-disable-statistics:unknown org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown +org.freedesktop.NetworkManager.enable-disable-network:yes +org.freedesktop.NetworkManager.enable-disable-statistics:unknown +org.freedesktop.NetworkManager.enable-disable-wifi:yes +org.freedesktop.NetworkManager.enable-disable-wimax:yes +org.freedesktop.NetworkManager.enable-disable-wwan:yes +org.freedesktop.NetworkManager.network-control:yes +org.freedesktop.NetworkManager.reload:no +org.freedesktop.NetworkManager.settings.modify.global-dns:no +org.freedesktop.NetworkManager.settings.modify.hostname:yes +org.freedesktop.NetworkManager.settings.modify.own:yes +org.freedesktop.NetworkManager.settings.modify.system:yes +org.freedesktop.NetworkManager.sleep-wake:no org.freedesktop.NetworkManager.wifi.scan:unknown +org.freedesktop.NetworkManager.wifi.share.open:yes +org.freedesktop.NetworkManager.wifi.share.protected:yes <<< size: 1115 @@ -693,23 +693,23 @@ lang: pl_PL.UTF-8 returncode: 0 stdout: 948 bytes >>> -org.freedesktop.NetworkManager.enable-disable-network:yes -org.freedesktop.NetworkManager.enable-disable-wifi:yes -org.freedesktop.NetworkManager.enable-disable-wwan:yes -org.freedesktop.NetworkManager.enable-disable-wimax:yes -org.freedesktop.NetworkManager.sleep-wake:no -org.freedesktop.NetworkManager.network-control:yes -org.freedesktop.NetworkManager.wifi.share.protected:yes -org.freedesktop.NetworkManager.wifi.share.open:yes -org.freedesktop.NetworkManager.settings.modify.system:yes -org.freedesktop.NetworkManager.settings.modify.own:yes -org.freedesktop.NetworkManager.settings.modify.hostname:yes -org.freedesktop.NetworkManager.settings.modify.global-dns:no -org.freedesktop.NetworkManager.reload:no org.freedesktop.NetworkManager.checkpoint-rollback:unknown -org.freedesktop.NetworkManager.enable-disable-statistics:unknown org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown +org.freedesktop.NetworkManager.enable-disable-network:yes +org.freedesktop.NetworkManager.enable-disable-statistics:unknown +org.freedesktop.NetworkManager.enable-disable-wifi:yes +org.freedesktop.NetworkManager.enable-disable-wimax:yes +org.freedesktop.NetworkManager.enable-disable-wwan:yes +org.freedesktop.NetworkManager.network-control:yes +org.freedesktop.NetworkManager.reload:no +org.freedesktop.NetworkManager.settings.modify.global-dns:no +org.freedesktop.NetworkManager.settings.modify.hostname:yes +org.freedesktop.NetworkManager.settings.modify.own:yes +org.freedesktop.NetworkManager.settings.modify.system:yes +org.freedesktop.NetworkManager.sleep-wake:no org.freedesktop.NetworkManager.wifi.scan:unknown +org.freedesktop.NetworkManager.wifi.share.open:yes +org.freedesktop.NetworkManager.wifi.share.protected:yes <<< size: 1235 @@ -719,23 +719,23 @@ lang: C returncode: 0 stdout: 1065 bytes >>> -org.freedesktop.NetworkManager.enable-disable-network:yes -org.freedesktop.NetworkManager.enable-disable-wifi:yes -org.freedesktop.NetworkManager.enable-disable-wwan:yes -org.freedesktop.NetworkManager.enable-disable-wimax:yes -org.freedesktop.NetworkManager.sleep-wake:no -org.freedesktop.NetworkManager.network-control:yes -org.freedesktop.NetworkManager.wifi.share.protected:yes -org.freedesktop.NetworkManager.wifi.share.open:yes -org.freedesktop.NetworkManager.settings.modify.system:yes -org.freedesktop.NetworkManager.settings.modify.own:yes -org.freedesktop.NetworkManager.settings.modify.hostname:yes -org.freedesktop.NetworkManager.settings.modify.global-dns:no -org.freedesktop.NetworkManager.reload:no org.freedesktop.NetworkManager.checkpoint-rollback:unknown -org.freedesktop.NetworkManager.enable-disable-statistics:unknown org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown +org.freedesktop.NetworkManager.enable-disable-network:yes +org.freedesktop.NetworkManager.enable-disable-statistics:unknown +org.freedesktop.NetworkManager.enable-disable-wifi:yes +org.freedesktop.NetworkManager.enable-disable-wimax:yes +org.freedesktop.NetworkManager.enable-disable-wwan:yes +org.freedesktop.NetworkManager.network-control:yes +org.freedesktop.NetworkManager.reload:no +org.freedesktop.NetworkManager.settings.modify.global-dns:no +org.freedesktop.NetworkManager.settings.modify.hostname:yes +org.freedesktop.NetworkManager.settings.modify.own:yes +org.freedesktop.NetworkManager.settings.modify.system:yes +org.freedesktop.NetworkManager.sleep-wake:no org.freedesktop.NetworkManager.wifi.scan:unknown +org.freedesktop.NetworkManager.wifi.share.open:yes +org.freedesktop.NetworkManager.wifi.share.protected:yes <<< size: 1245 @@ -745,23 +745,23 @@ lang: pl_PL.UTF-8 returncode: 0 stdout: 1065 bytes >>> -org.freedesktop.NetworkManager.enable-disable-network:yes -org.freedesktop.NetworkManager.enable-disable-wifi:yes -org.freedesktop.NetworkManager.enable-disable-wwan:yes -org.freedesktop.NetworkManager.enable-disable-wimax:yes -org.freedesktop.NetworkManager.sleep-wake:no -org.freedesktop.NetworkManager.network-control:yes -org.freedesktop.NetworkManager.wifi.share.protected:yes -org.freedesktop.NetworkManager.wifi.share.open:yes -org.freedesktop.NetworkManager.settings.modify.system:yes -org.freedesktop.NetworkManager.settings.modify.own:yes -org.freedesktop.NetworkManager.settings.modify.hostname:yes -org.freedesktop.NetworkManager.settings.modify.global-dns:no -org.freedesktop.NetworkManager.reload:no org.freedesktop.NetworkManager.checkpoint-rollback:unknown -org.freedesktop.NetworkManager.enable-disable-statistics:unknown org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown +org.freedesktop.NetworkManager.enable-disable-network:yes +org.freedesktop.NetworkManager.enable-disable-statistics:unknown +org.freedesktop.NetworkManager.enable-disable-wifi:yes +org.freedesktop.NetworkManager.enable-disable-wimax:yes +org.freedesktop.NetworkManager.enable-disable-wwan:yes +org.freedesktop.NetworkManager.network-control:yes +org.freedesktop.NetworkManager.reload:no +org.freedesktop.NetworkManager.settings.modify.global-dns:no +org.freedesktop.NetworkManager.settings.modify.hostname:yes +org.freedesktop.NetworkManager.settings.modify.own:yes +org.freedesktop.NetworkManager.settings.modify.system:yes +org.freedesktop.NetworkManager.sleep-wake:no org.freedesktop.NetworkManager.wifi.scan:unknown +org.freedesktop.NetworkManager.wifi.share.open:yes +org.freedesktop.NetworkManager.wifi.share.protected:yes <<< size: 2460 @@ -771,40 +771,40 @@ lang: C returncode: 0 stdout: 2308 bytes >>> -PERMISSION: org.freedesktop.NetworkManager.enable-disable-network -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.sleep-wake -VALUE: no -PERMISSION: org.freedesktop.NetworkManager.network-control -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.wifi.share.open -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.settings.modify.system -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.settings.modify.own -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns -VALUE: no -PERMISSION: org.freedesktop.NetworkManager.reload -VALUE: no PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback VALUE: unknown -PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics -VALUE: unknown PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check VALUE: unknown +PERMISSION: org.freedesktop.NetworkManager.enable-disable-network +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics +VALUE: unknown +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.network-control +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.reload +VALUE: no +PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns +VALUE: no +PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.settings.modify.own +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.settings.modify.system +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.sleep-wake +VALUE: no PERMISSION: org.freedesktop.NetworkManager.wifi.scan VALUE: unknown +PERMISSION: org.freedesktop.NetworkManager.wifi.share.open +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected +VALUE: yes <<< size: 2477 @@ -814,40 +814,40 @@ lang: pl_PL.UTF-8 returncode: 0 stdout: 2315 bytes >>> -PERMISSION: org.freedesktop.NetworkManager.enable-disable-network -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.sleep-wake -VALUE: nie -PERMISSION: org.freedesktop.NetworkManager.network-control -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.wifi.share.open -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.settings.modify.system -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.settings.modify.own -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns -VALUE: nie -PERMISSION: org.freedesktop.NetworkManager.reload -VALUE: nie PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback VALUE: nieznane -PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics -VALUE: nieznane PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check VALUE: nieznane +PERMISSION: org.freedesktop.NetworkManager.enable-disable-network +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics +VALUE: nieznane +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.network-control +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.reload +VALUE: nie +PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns +VALUE: nie +PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.settings.modify.own +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.settings.modify.system +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.sleep-wake +VALUE: nie PERMISSION: org.freedesktop.NetworkManager.wifi.scan VALUE: nieznane +PERMISSION: org.freedesktop.NetworkManager.wifi.share.open +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected +VALUE: tak <<< size: 2589 @@ -857,40 +857,40 @@ lang: C returncode: 0 stdout: 2425 bytes >>> -PERMISSION: org.freedesktop.NetworkManager.enable-disable-network -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.sleep-wake -VALUE: no -PERMISSION: org.freedesktop.NetworkManager.network-control -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.wifi.share.open -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.settings.modify.system -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.settings.modify.own -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns -VALUE: no -PERMISSION: org.freedesktop.NetworkManager.reload -VALUE: no PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback VALUE: unknown -PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics -VALUE: unknown PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check VALUE: unknown +PERMISSION: org.freedesktop.NetworkManager.enable-disable-network +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics +VALUE: unknown +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.network-control +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.reload +VALUE: no +PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns +VALUE: no +PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.settings.modify.own +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.settings.modify.system +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.sleep-wake +VALUE: no PERMISSION: org.freedesktop.NetworkManager.wifi.scan VALUE: unknown +PERMISSION: org.freedesktop.NetworkManager.wifi.share.open +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected +VALUE: yes <<< size: 2606 @@ -900,40 +900,40 @@ lang: pl_PL.UTF-8 returncode: 0 stdout: 2432 bytes >>> -PERMISSION: org.freedesktop.NetworkManager.enable-disable-network -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.sleep-wake -VALUE: nie -PERMISSION: org.freedesktop.NetworkManager.network-control -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.wifi.share.open -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.settings.modify.system -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.settings.modify.own -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns -VALUE: nie -PERMISSION: org.freedesktop.NetworkManager.reload -VALUE: nie PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback VALUE: nieznane -PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics -VALUE: nieznane PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check VALUE: nieznane +PERMISSION: org.freedesktop.NetworkManager.enable-disable-network +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics +VALUE: nieznane +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.network-control +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.reload +VALUE: nie +PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns +VALUE: nie +PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.settings.modify.own +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.settings.modify.system +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.sleep-wake +VALUE: nie PERMISSION: org.freedesktop.NetworkManager.wifi.scan VALUE: nieznane +PERMISSION: org.freedesktop.NetworkManager.wifi.share.open +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected +VALUE: tak <<< size: 4042 @@ -946,57 +946,57 @@ stdout: 3881 bytes =============================================================================== NetworkManager permissions =============================================================================== -PERMISSION: org.freedesktop.NetworkManager.enable-disable-network -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.sleep-wake -VALUE: no -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.network-control -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.wifi.share.open -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.settings.modify.system -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.settings.modify.own -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns -VALUE: no -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.reload -VALUE: no -------------------------------------------------------------------------------- PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback VALUE: unknown ------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics -VALUE: unknown -------------------------------------------------------------------------------- PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check VALUE: unknown ------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-network +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics +VALUE: unknown +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.network-control +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.reload +VALUE: no +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns +VALUE: no +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.own +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.system +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.sleep-wake +VALUE: no +------------------------------------------------------------------------------- PERMISSION: org.freedesktop.NetworkManager.wifi.scan VALUE: unknown ------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.wifi.share.open +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected +VALUE: yes +------------------------------------------------------------------------------- <<< size: 4064 @@ -1009,57 +1009,57 @@ stdout: 3893 bytes =============================================================================== Uprawnienia usługi NetworkManager =============================================================================== -PERMISSION: org.freedesktop.NetworkManager.enable-disable-network -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.sleep-wake -VALUE: nie -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.network-control -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.wifi.share.open -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.settings.modify.system -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.settings.modify.own -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns -VALUE: nie -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.reload -VALUE: nie -------------------------------------------------------------------------------- PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback VALUE: nieznane ------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics -VALUE: nieznane -------------------------------------------------------------------------------- PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check VALUE: nieznane ------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-network +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics +VALUE: nieznane +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.network-control +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.reload +VALUE: nie +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns +VALUE: nie +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.own +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.system +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.sleep-wake +VALUE: nie +------------------------------------------------------------------------------- PERMISSION: org.freedesktop.NetworkManager.wifi.scan VALUE: nieznane ------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.wifi.share.open +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected +VALUE: tak +------------------------------------------------------------------------------- <<< size: 4171 @@ -1072,57 +1072,57 @@ stdout: 3998 bytes =============================================================================== NetworkManager permissions =============================================================================== -PERMISSION: org.freedesktop.NetworkManager.enable-disable-network -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.sleep-wake -VALUE: no -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.network-control -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.wifi.share.open -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.settings.modify.system -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.settings.modify.own -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns -VALUE: no -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.reload -VALUE: no -------------------------------------------------------------------------------- PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback VALUE: unknown ------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics -VALUE: unknown -------------------------------------------------------------------------------- PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check VALUE: unknown ------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-network +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics +VALUE: unknown +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.network-control +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.reload +VALUE: no +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns +VALUE: no +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.own +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.system +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.sleep-wake +VALUE: no +------------------------------------------------------------------------------- PERMISSION: org.freedesktop.NetworkManager.wifi.scan VALUE: unknown ------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.wifi.share.open +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected +VALUE: yes +------------------------------------------------------------------------------- <<< size: 4193 @@ -1135,57 +1135,57 @@ stdout: 4010 bytes =============================================================================== Uprawnienia usługi NetworkManager =============================================================================== -PERMISSION: org.freedesktop.NetworkManager.enable-disable-network -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.sleep-wake -VALUE: nie -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.network-control -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.wifi.share.open -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.settings.modify.system -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.settings.modify.own -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns -VALUE: nie -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.reload -VALUE: nie -------------------------------------------------------------------------------- PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback VALUE: nieznane ------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics -VALUE: nieznane -------------------------------------------------------------------------------- PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check VALUE: nieznane ------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-network +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics +VALUE: nieznane +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.network-control +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.reload +VALUE: nie +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns +VALUE: nie +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.own +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.system +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.sleep-wake +VALUE: nie +------------------------------------------------------------------------------- PERMISSION: org.freedesktop.NetworkManager.wifi.scan VALUE: nieznane ------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.wifi.share.open +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected +VALUE: tak +------------------------------------------------------------------------------- <<< size: 1397 @@ -1195,40 +1195,40 @@ lang: C returncode: 0 stdout: 1237 bytes >>> -PERMISSION:org.freedesktop.NetworkManager.enable-disable-network -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.enable-disable-wifi -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.enable-disable-wwan -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.enable-disable-wimax -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.sleep-wake -VALUE:no -PERMISSION:org.freedesktop.NetworkManager.network-control -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.wifi.share.open -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.settings.modify.system -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.settings.modify.own -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.settings.modify.hostname -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.settings.modify.global-dns -VALUE:no -PERMISSION:org.freedesktop.NetworkManager.reload -VALUE:no PERMISSION:org.freedesktop.NetworkManager.checkpoint-rollback VALUE:unknown -PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics -VALUE:unknown PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check VALUE:unknown +PERMISSION:org.freedesktop.NetworkManager.enable-disable-network +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics +VALUE:unknown +PERMISSION:org.freedesktop.NetworkManager.enable-disable-wifi +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.enable-disable-wimax +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.enable-disable-wwan +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.network-control +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.reload +VALUE:no +PERMISSION:org.freedesktop.NetworkManager.settings.modify.global-dns +VALUE:no +PERMISSION:org.freedesktop.NetworkManager.settings.modify.hostname +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.settings.modify.own +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.settings.modify.system +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.sleep-wake +VALUE:no PERMISSION:org.freedesktop.NetworkManager.wifi.scan VALUE:unknown +PERMISSION:org.freedesktop.NetworkManager.wifi.share.open +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected +VALUE:yes <<< size: 1407 @@ -1238,40 +1238,40 @@ lang: pl_PL.UTF-8 returncode: 0 stdout: 1237 bytes >>> -PERMISSION:org.freedesktop.NetworkManager.enable-disable-network -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.enable-disable-wifi -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.enable-disable-wwan -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.enable-disable-wimax -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.sleep-wake -VALUE:no -PERMISSION:org.freedesktop.NetworkManager.network-control -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.wifi.share.open -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.settings.modify.system -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.settings.modify.own -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.settings.modify.hostname -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.settings.modify.global-dns -VALUE:no -PERMISSION:org.freedesktop.NetworkManager.reload -VALUE:no PERMISSION:org.freedesktop.NetworkManager.checkpoint-rollback VALUE:unknown -PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics -VALUE:unknown PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check VALUE:unknown +PERMISSION:org.freedesktop.NetworkManager.enable-disable-network +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics +VALUE:unknown +PERMISSION:org.freedesktop.NetworkManager.enable-disable-wifi +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.enable-disable-wimax +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.enable-disable-wwan +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.network-control +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.reload +VALUE:no +PERMISSION:org.freedesktop.NetworkManager.settings.modify.global-dns +VALUE:no +PERMISSION:org.freedesktop.NetworkManager.settings.modify.hostname +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.settings.modify.own +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.settings.modify.system +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.sleep-wake +VALUE:no PERMISSION:org.freedesktop.NetworkManager.wifi.scan VALUE:unknown +PERMISSION:org.freedesktop.NetworkManager.wifi.share.open +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected +VALUE:yes <<< size: 1526 @@ -1281,40 +1281,40 @@ lang: C returncode: 0 stdout: 1354 bytes >>> -PERMISSION:org.freedesktop.NetworkManager.enable-disable-network -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.enable-disable-wifi -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.enable-disable-wwan -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.enable-disable-wimax -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.sleep-wake -VALUE:no -PERMISSION:org.freedesktop.NetworkManager.network-control -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.wifi.share.open -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.settings.modify.system -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.settings.modify.own -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.settings.modify.hostname -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.settings.modify.global-dns -VALUE:no -PERMISSION:org.freedesktop.NetworkManager.reload -VALUE:no PERMISSION:org.freedesktop.NetworkManager.checkpoint-rollback VALUE:unknown -PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics -VALUE:unknown PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check VALUE:unknown +PERMISSION:org.freedesktop.NetworkManager.enable-disable-network +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics +VALUE:unknown +PERMISSION:org.freedesktop.NetworkManager.enable-disable-wifi +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.enable-disable-wimax +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.enable-disable-wwan +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.network-control +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.reload +VALUE:no +PERMISSION:org.freedesktop.NetworkManager.settings.modify.global-dns +VALUE:no +PERMISSION:org.freedesktop.NetworkManager.settings.modify.hostname +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.settings.modify.own +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.settings.modify.system +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.sleep-wake +VALUE:no PERMISSION:org.freedesktop.NetworkManager.wifi.scan VALUE:unknown +PERMISSION:org.freedesktop.NetworkManager.wifi.share.open +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected +VALUE:yes <<< size: 1536 @@ -1324,39 +1324,39 @@ lang: pl_PL.UTF-8 returncode: 0 stdout: 1354 bytes >>> -PERMISSION:org.freedesktop.NetworkManager.enable-disable-network -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.enable-disable-wifi -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.enable-disable-wwan -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.enable-disable-wimax -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.sleep-wake -VALUE:no -PERMISSION:org.freedesktop.NetworkManager.network-control -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.wifi.share.open -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.settings.modify.system -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.settings.modify.own -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.settings.modify.hostname -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.settings.modify.global-dns -VALUE:no -PERMISSION:org.freedesktop.NetworkManager.reload -VALUE:no PERMISSION:org.freedesktop.NetworkManager.checkpoint-rollback VALUE:unknown -PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics -VALUE:unknown PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check VALUE:unknown +PERMISSION:org.freedesktop.NetworkManager.enable-disable-network +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics +VALUE:unknown +PERMISSION:org.freedesktop.NetworkManager.enable-disable-wifi +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.enable-disable-wimax +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.enable-disable-wwan +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.network-control +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.reload +VALUE:no +PERMISSION:org.freedesktop.NetworkManager.settings.modify.global-dns +VALUE:no +PERMISSION:org.freedesktop.NetworkManager.settings.modify.hostname +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.settings.modify.own +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.settings.modify.system +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.sleep-wake +VALUE:no PERMISSION:org.freedesktop.NetworkManager.wifi.scan VALUE:unknown +PERMISSION:org.freedesktop.NetworkManager.wifi.share.open +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected +VALUE:yes <<< From 51bc2c02242ead7659c417cfa2336a231ac4ea24 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 6 Dec 2019 11:48:04 +0100 Subject: [PATCH 053/109] libnm: track permissions in NMClient as an array of well known permissions On D-Bus, the permission names are just the PolicyKit action names, like "org.freedesktop.NetworkManager.wifi.scan". But NMClient already ignores all strings that it doesn't know at compile time and only keeps track of well known permission. And neither does the API nm_client_get_permissions_result() allow to expose permissions unknown to libnm. Maybe the API of NMClient should be more generic and allow exposing any permissions announced by NetworkManager. As it is however, it's not necessary to track the permissions in a hash table. An array with fixed indices is sufficient. --- libnm/nm-client.c | 80 ++++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 39 deletions(-) diff --git a/libnm/nm-client.c b/libnm/nm-client.c index 42cba4095d..b10456e274 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -278,7 +278,7 @@ typedef struct { NMLDBusObject *dbobj_settings; NMLDBusObject *dbobj_dns_manager; - GHashTable *permissions; + guint8 *permissions; GCancellable *permissions_cancellable; char *name_owner; @@ -3311,27 +3311,35 @@ _dbus_nm_vpn_connection_state_changed_cb (GDBusConnection *connection, static void _emit_permissions_changed (NMClient *self, - GHashTable *permissions, - gboolean force_unknown) + const guint8 *old_permissions, + const guint8 *permissions) { - GHashTableIter iter; - gpointer key; - gpointer value; + int i; - if (!permissions) - return; if (self->obj_base.is_disposing) return; - g_hash_table_iter_init (&iter, permissions); - while (g_hash_table_iter_next (&iter, &key, &value)) { + if (old_permissions == permissions) + return; + + for (i = 0; i < (int) G_N_ELEMENTS (nm_auth_permission_sorted); i++) { + NMClientPermission perm = nm_auth_permission_sorted[i]; + NMClientPermissionResult perm_result = NM_CLIENT_PERMISSION_RESULT_UNKNOWN; + NMClientPermissionResult perm_result_old = NM_CLIENT_PERMISSION_RESULT_UNKNOWN; + + if (permissions) + perm_result = permissions[perm - 1]; + if (old_permissions) + perm_result_old = old_permissions[perm - 1]; + + if (perm_result == perm_result_old) + continue; + g_signal_emit (self, signals[PERMISSION_CHANGED], 0, - GPOINTER_TO_UINT (key), - force_unknown - ? (guint) NM_CLIENT_PERMISSION_NONE - : GPOINTER_TO_UINT (value)); + (guint) perm, + (guint) perm_result); } } @@ -3344,10 +3352,11 @@ _dbus_check_permissions_start_cb (GObject *source, GAsyncResult *result, gpointe NMClientPrivate *priv; gs_unref_variant GVariant *ret = NULL; nm_auto_free_variant_iter GVariantIter *v_permissions = NULL; - gs_unref_hashtable GHashTable *old_permissions = NULL; + gs_free guint8 *old_permissions = NULL; gs_free_error GError *error = NULL; const char *pkey; const char *pvalue; + int i; ret = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), result, &error); if ( !ret @@ -3366,9 +3375,10 @@ _dbus_check_permissions_start_cb (GObject *source, GAsyncResult *result, gpointe NML_NMCLIENT_LOG_T (self, "GetPermissions call finished with success"); - /* get list of old permissions for change notification */ old_permissions = g_steal_pointer (&priv->permissions); - priv->permissions = g_hash_table_new (nm_direct_hash, NULL); + priv->permissions = g_new (guint8, G_N_ELEMENTS (nm_auth_permission_sorted)); + for (i = 0; i < (int) G_N_ELEMENTS (nm_auth_permission_sorted); i++) + priv->permissions[i] = NM_CLIENT_PERMISSION_NONE; g_variant_get (ret, "(a{ss})", &v_permissions); while (g_variant_iter_next (v_permissions, "{&s&s}", &pkey, &pvalue)) { @@ -3380,19 +3390,11 @@ _dbus_check_permissions_start_cb (GObject *source, GAsyncResult *result, gpointe continue; perm_result = nm_client_permission_result_from_string (pvalue); - - g_hash_table_insert (priv->permissions, - GUINT_TO_POINTER (perm), - GUINT_TO_POINTER (perm_result)); - if (old_permissions) { - g_hash_table_remove (old_permissions, - GUINT_TO_POINTER (perm)); - } + priv->permissions[perm - 1] = perm_result; } dbus_context = nm_g_main_context_push_thread_default_if_necessary (priv->main_context); - _emit_permissions_changed (self, priv->permissions, FALSE); - _emit_permissions_changed (self, old_permissions, TRUE); + _emit_permissions_changed (self, old_permissions, priv->permissions); } static void @@ -4271,18 +4273,18 @@ NMClientPermissionResult nm_client_get_permission_result (NMClient *client, NMClientPermission permission) { NMClientPrivate *priv; - gpointer result; + NMClientPermissionResult result = NM_CLIENT_PERMISSION_RESULT_UNKNOWN; g_return_val_if_fail (NM_IS_CLIENT (client), NM_CLIENT_PERMISSION_RESULT_UNKNOWN); - priv = NM_CLIENT_GET_PRIVATE (client); - if ( !priv->permissions - || !g_hash_table_lookup_extended (priv->permissions, - GUINT_TO_POINTER (permission), - NULL, - &result)) - return NM_CLIENT_PERMISSION_RESULT_UNKNOWN; - return GPOINTER_TO_UINT (result); + if ( permission > NM_CLIENT_PERMISSION_NONE + && permission <= NM_CLIENT_PERMISSION_LAST) { + priv = NM_CLIENT_GET_PRIVATE (client); + if (priv->permissions) + result = priv->permissions[permission - 1]; + } + + return result; } /** @@ -6553,9 +6555,9 @@ _init_release_all (NMClient *self) &priv->dbsid_nm_check_permissions); if (priv->permissions) { - gs_unref_hashtable GHashTable *old_permissions = g_steal_pointer (&priv->permissions); + gs_free guint8 *old_permissions = g_steal_pointer (&priv->permissions); - _emit_permissions_changed (self, old_permissions, TRUE); + _emit_permissions_changed (self, old_permissions, NULL); } nm_assert (c_list_is_empty (&priv->obj_changed_lst_head)); @@ -7372,7 +7374,7 @@ dispose (GObject *object) nm_clear_pointer (&priv->dbus_context, g_main_context_unref); nm_clear_pointer (&priv->main_context, g_main_context_unref); - nm_clear_pointer (&priv->permissions, g_hash_table_unref); + nm_clear_g_free (&priv->permissions); g_clear_object (&priv->dbus_connection); From f7aeda03901dbda40697f588b4a6129160c5dc1e Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 5 Dec 2019 18:17:43 +0100 Subject: [PATCH 054/109] libnm: add NMClient:instance-flags property Add a flags property to control behavior of NMClient. Possible future use cases: - currently it would always automatically fetch permissions. Often that is not used and the user could opt out of it. - currently, using sync init creates an internal GMainContext. This has an overhead and may be undesirable. We could implement another "sync" initialization that would merely iterate the callers mainloop until the initialization completes. A flag would allow to opt in. - currently, NMClient always fetches all connection settings automatically. Via a flag the user could opt out of that. Instead NMClient could provide an API so the user can request settings as they are needed. --- libnm/libnm.ver | 6 ++++ libnm/nm-client.c | 62 ++++++++++++++++++++++++++++++++++++++++++ libnm/nm-client.h | 15 ++++++++++ libnm/nm-libnm-utils.h | 2 ++ 4 files changed, 85 insertions(+) diff --git a/libnm/libnm.ver b/libnm/libnm.ver index fb5a4f64df..ffd6e3dbd5 100644 --- a/libnm/libnm.ver +++ b/libnm/libnm.ver @@ -1652,3 +1652,9 @@ global: nm_setting_gsm_get_auto_config; nm_setting_ip_config_get_dhcp_hostname_flags; } libnm_1_20_0; + +libnm_1_24_0 { +global: + nm_client_get_instance_flags; + nm_client_instance_flags_get_type; +} libnm_1_22_0; diff --git a/libnm/nm-client.c b/libnm/nm-client.c index b10456e274..6b2844a0d7 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -195,6 +195,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMClient, PROP_DBUS_CONNECTION, PROP_DBUS_NAME_OWNER, PROP_VERSION, + PROP_INSTANCE_FLAGS, PROP_STATE, PROP_STARTUP, PROP_NM_RUNNING, @@ -290,6 +291,10 @@ typedef struct { guint dbsid_nm_vpn_connection_state_changed; guint dbsid_nm_check_permissions; + NMClientInstanceFlags instance_flags:3; + + bool instance_flags_constructed:1; + bool udev_inited:1; bool notify_event_lst_changed:1; bool check_dbobj_visible_all:1; @@ -3750,6 +3755,22 @@ _request_wait_finish (NMClient *client, /*****************************************************************************/ +/** + * nm_client_get_instance_flags: + * @self: the #NMClient instance. + * + * Returns: the #NMClientInstanceFlags flags. + * + * Since: 1.24 + */ +NMClientInstanceFlags +nm_client_get_instance_flags (NMClient *self) +{ + g_return_val_if_fail (NM_IS_CLIENT (self), NM_CLIENT_INSTANCE_FLAGS_NONE); + + return NM_CLIENT_GET_PRIVATE (self)->instance_flags; +} + /** * nm_client_get_dbus_connection: * @client: a #NMClient @@ -6929,6 +6950,9 @@ get_property (GObject *object, guint prop_id, NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (object); switch (prop_id) { + case PROP_INSTANCE_FLAGS: + g_value_set_uint (value, priv->instance_flags); + break; case PROP_DBUS_CONNECTION: g_value_set_object (value, priv->dbus_connection); break; @@ -7041,8 +7065,27 @@ set_property (GObject *object, guint prop_id, NMClient *self = NM_CLIENT (object); NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (self); gboolean b; + guint v_uint; switch (prop_id) { + + case PROP_INSTANCE_FLAGS: + /* construct */ + + v_uint = g_value_get_uint (value); + g_return_if_fail (!NM_FLAGS_ANY (v_uint, ~((guint) NM_CLIENT_INSTANCE_FLAGS_ALL))); + v_uint &= ((guint) NM_CLIENT_INSTANCE_FLAGS_ALL); + + if (!priv->instance_flags_constructed) { + priv->instance_flags_constructed = TRUE; + priv->instance_flags = v_uint; + nm_assert ((guint) priv->instance_flags == v_uint); + } else { + /* Later, we may want to implement setting some flags not only at construct time. + * For now, that is not implemented and resetting flags afterwards has no effect. */ + } + break; + case PROP_DBUS_CONNECTION: /* construct-only */ priv->dbus_connection = g_value_dup_object (value); @@ -7475,6 +7518,25 @@ nm_client_class_init (NMClientClass *client_class) G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); + /** + * NMClient:instance-flags: + * + * #NMClientInstanceFlags for the instance. These affect behavior of #NMClient. + * This is a construct property and you may only set the flags during + * construction. + * + * Since: 1.24 + */ + obj_properties[PROP_INSTANCE_FLAGS] = + g_param_spec_uint (NM_CLIENT_INSTANCE_FLAGS, "", "", + 0, + G_MAXUINT32, + 0, + G_PARAM_READABLE | + G_PARAM_WRITABLE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_STRINGS); + /** * NMClient:dbus-name-owner: * diff --git a/libnm/nm-client.h b/libnm/nm-client.h index 6bff58684e..4dc1a16791 100644 --- a/libnm/nm-client.h +++ b/libnm/nm-client.h @@ -15,6 +15,16 @@ G_BEGIN_DECLS +/** + * NMClientInstanceFlags: + * @NM_CLIENT_INSTANCE_FLAGS_NONE: special value to indicate no flags. + * + * Since: 1.24 + */ +typedef enum { /*< flags >*/ + NM_CLIENT_INSTANCE_FLAGS_NONE = 0, +} NMClientInstanceFlags; + #define NM_TYPE_CLIENT (nm_client_get_type ()) #define NM_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_CLIENT, NMClient)) #define NM_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_CLIENT, NMClientClass)) @@ -28,6 +38,7 @@ G_BEGIN_DECLS #define NM_CLIENT_NM_RUNNING "nm-running" #define NM_CLIENT_DBUS_CONNECTION "dbus-connection" #define NM_CLIENT_DBUS_NAME_OWNER "dbus-name-owner" +#define NM_CLIENT_INSTANCE_FLAGS "instance-flags" _NM_DEPRECATED_SYNC_WRITABLE_PROPERTY #define NM_CLIENT_NETWORKING_ENABLED "networking-enabled" @@ -133,6 +144,10 @@ void nm_client_new_async (GCancellable *cancellable, NMClient *nm_client_new_finish (GAsyncResult *result, GError **error); + +NM_AVAILABLE_IN_1_24 +NMClientInstanceFlags nm_client_get_instance_flags (NMClient *self); + NM_AVAILABLE_IN_1_22 GDBusConnection *nm_client_get_dbus_connection (NMClient *client); diff --git a/libnm/nm-libnm-utils.h b/libnm/nm-libnm-utils.h index 304c35f4be..5dea53c682 100644 --- a/libnm/nm-libnm-utils.h +++ b/libnm/nm-libnm-utils.h @@ -166,6 +166,8 @@ typedef enum { /*****************************************************************************/ +#define NM_CLIENT_INSTANCE_FLAGS_ALL ((NMClientInstanceFlags) 0x0) + typedef struct { GType (*get_o_type_fcn) (void); From a33ed5ad820242adcfa87d30f2a7dd540f1d32e8 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 5 Dec 2019 15:53:51 +0100 Subject: [PATCH 055/109] libnm: allow to enable/disable fetching of permissions in NMClient Currently, NMClient by default always fetches the permissions ("GetPermissions()") and refreshes them on "CheckPermissions" signal. Fetching permissions is relatively expensive, while they are not used most of the time. Allow the user to opt out of this. For that, have a NMClientInstanceFlags to enable/disable automatic fetching. Also add a "permissions-state" property that allows the user to understand whether the cached permissions are up to date or not. This is a bit an awkward API for handling this. E.g. you cannot explicitly request permissions, you can just enable/disable fetching permissions. And then you can watch the permission-state to know whether you are ready. It's done this way because it fits the previous model and extends the API with a (relative) small amount of new functions and properties. --- libnm/libnm.ver | 1 + libnm/nm-client.c | 146 ++++++++++++++++++++++++++++++++++------- libnm/nm-client.h | 13 +++- libnm/nm-libnm-utils.h | 2 +- 4 files changed, 138 insertions(+), 24 deletions(-) diff --git a/libnm/libnm.ver b/libnm/libnm.ver index ffd6e3dbd5..d2af078d8d 100644 --- a/libnm/libnm.ver +++ b/libnm/libnm.ver @@ -1656,5 +1656,6 @@ global: libnm_1_24_0 { global: nm_client_get_instance_flags; + nm_client_get_permissions_state; nm_client_instance_flags_get_type; } libnm_1_22_0; diff --git a/libnm/nm-client.c b/libnm/nm-client.c index 6b2844a0d7..4dd0c222e1 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -223,6 +223,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMClient, PROP_DNS_RC_MANAGER, PROP_DNS_CONFIGURATION, PROP_CHECKPOINTS, + PROP_PERMISSIONS_STATE, ); enum { @@ -293,6 +294,8 @@ typedef struct { NMClientInstanceFlags instance_flags:3; + NMTernary permissions_state:3; + bool instance_flags_constructed:1; bool udev_inited:1; @@ -3373,18 +3376,17 @@ _dbus_check_permissions_start_cb (GObject *source, GAsyncResult *result, gpointe g_clear_object (&priv->permissions_cancellable); + old_permissions = g_steal_pointer (&priv->permissions); + if (!ret) { + /* when the call completes, we always pretend success. Even a failure means + * that we fetched the permissions, however they are all unknown. */ NML_NMCLIENT_LOG_T (self, "GetPermissions call failed: %s", error->message); - return; + goto out; } NML_NMCLIENT_LOG_T (self, "GetPermissions call finished with success"); - old_permissions = g_steal_pointer (&priv->permissions); - priv->permissions = g_new (guint8, G_N_ELEMENTS (nm_auth_permission_sorted)); - for (i = 0; i < (int) G_N_ELEMENTS (nm_auth_permission_sorted); i++) - priv->permissions[i] = NM_CLIENT_PERMISSION_NONE; - g_variant_get (ret, "(a{ss})", &v_permissions); while (g_variant_iter_next (v_permissions, "{&s&s}", &pkey, &pvalue)) { NMClientPermission perm; @@ -3395,34 +3397,52 @@ _dbus_check_permissions_start_cb (GObject *source, GAsyncResult *result, gpointe continue; perm_result = nm_client_permission_result_from_string (pvalue); + + if (!priv->permissions) { + if (perm_result == NM_CLIENT_PERMISSION_RESULT_UNKNOWN) + continue; + priv->permissions = g_new (guint8, G_N_ELEMENTS (nm_auth_permission_sorted)); + for (i = 0; i < (int) G_N_ELEMENTS (nm_auth_permission_sorted); i++) + priv->permissions[i] = NM_CLIENT_PERMISSION_RESULT_UNKNOWN; + } priv->permissions[perm - 1] = perm_result; } +out: + priv->permissions_state = NM_TERNARY_TRUE; + dbus_context = nm_g_main_context_push_thread_default_if_necessary (priv->main_context); _emit_permissions_changed (self, old_permissions, priv->permissions); + _notify (self, PROP_PERMISSIONS_STATE); } static void _dbus_check_permissions_start (NMClient *self) { NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (self); + gboolean fetch; + + fetch = !NM_FLAGS_HAS ((NMClientInstanceFlags) priv->instance_flags, + NM_CLIENT_INSTANCE_FLAGS_NO_AUTO_FETCH_PERMISSIONS); nm_clear_g_cancellable (&priv->permissions_cancellable); - priv->permissions_cancellable = g_cancellable_new (); - NML_NMCLIENT_LOG_T (self, "GetPermissions() call started..."); + if (fetch) { + NML_NMCLIENT_LOG_T (self, "GetPermissions() call started..."); - _nm_client_dbus_call_simple (self, - priv->permissions_cancellable, - NM_DBUS_PATH, - NM_DBUS_INTERFACE, - "GetPermissions", - g_variant_new ("()"), - G_VARIANT_TYPE ("(a{ss})"), - G_DBUS_CALL_FLAGS_NONE, - NM_DBUS_DEFAULT_TIMEOUT_MSEC, - _dbus_check_permissions_start_cb, - self); + priv->permissions_cancellable = g_cancellable_new (); + _nm_client_dbus_call_simple (self, + priv->permissions_cancellable, + NM_DBUS_PATH, + NM_DBUS_INTERFACE, + "GetPermissions", + g_variant_new ("()"), + G_VARIANT_TYPE ("(a{ss})"), + G_DBUS_CALL_FLAGS_NONE, + NM_DBUS_DEFAULT_TIMEOUT_MSEC, + _dbus_check_permissions_start_cb, + self); + } } static void @@ -3435,6 +3455,7 @@ _dbus_nm_check_permissions_cb (GDBusConnection *connection, gpointer user_data) { NMClient *self = user_data; + NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (self); if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("()"))) { NML_NMCLIENT_LOG_E (self, "ignore CheckPermissions signal with unexpected signature %s", @@ -3443,6 +3464,10 @@ _dbus_nm_check_permissions_cb (GDBusConnection *connection, } _dbus_check_permissions_start (self); + + if (priv->permissions_state == NM_TERNARY_TRUE) + priv->permissions_state = NM_TERNARY_FALSE; + _notify (self, PROP_PERMISSIONS_STATE); } /*****************************************************************************/ @@ -4308,6 +4333,27 @@ nm_client_get_permission_result (NMClient *client, NMClientPermission permission return result; } +/** + * nm_client_get_permissions_state: + * @self: the #NMClient instance + * + * Returns: the state of the cached permissions. %NM_TERNARY_DEFAULT + * means that no permissions result was yet received. All permissions + * are unknown. %NM_TERNARY_TRUE means that the permissions got received + * and are cached. %%NM_TERNARY_FALSE means that permissions are cached, + * but they are invalided as as "CheckPermissions" signal was received + * in the meantime. + * + * Since: 1.24 + */ +NMTernary +nm_client_get_permissions_state (NMClient *self) +{ + g_return_val_if_fail (NM_IS_CLIENT (self), NM_TERNARY_DEFAULT); + + return NM_CLIENT_GET_PRIVATE (self)->permissions_state; +} + /** * nm_client_get_connectivity: * @client: an #NMClient @@ -6556,6 +6602,7 @@ _init_release_all (NMClient *self) CList **dbus_objects_lst_heads; NMLDBusObject *dbobj; int i; + gboolean permissions_state_changed = FALSE; NML_NMCLIENT_LOG_D (self, "release all"); @@ -6575,12 +6622,20 @@ _init_release_all (NMClient *self) nm_clear_g_dbus_connection_signal (priv->dbus_connection, &priv->dbsid_nm_check_permissions); + if (priv->permissions_state != NM_TERNARY_DEFAULT) { + priv->permissions_state = NM_TERNARY_DEFAULT; + permissions_state_changed = TRUE; + } + if (priv->permissions) { gs_free guint8 *old_permissions = g_steal_pointer (&priv->permissions); _emit_permissions_changed (self, old_permissions, NULL); } + if (permissions_state_changed) + _notify (self, PROP_PERMISSIONS_STATE); + nm_assert (c_list_is_empty (&priv->obj_changed_lst_head)); dbus_objects_lst_heads = ((CList *[]) { @@ -7027,6 +7082,9 @@ get_property (GObject *object, guint prop_id, case PROP_CHECKPOINTS: g_value_take_boxed (value, _nm_utils_copy_object_array (nm_client_get_checkpoints (self))); break; + case PROP_PERMISSIONS_STATE: + g_value_set_enum (value, priv->permissions_state); + break; /* Settings properties. */ case PROP_CONNECTIONS: @@ -7081,8 +7139,19 @@ set_property (GObject *object, guint prop_id, priv->instance_flags = v_uint; nm_assert ((guint) priv->instance_flags == v_uint); } else { - /* Later, we may want to implement setting some flags not only at construct time. - * For now, that is not implemented and resetting flags afterwards has no effect. */ + NMClientInstanceFlags flags = v_uint; + + /* After object construction, we only allow to toggle certain flags and + * ignore all other flags. */ + + if ((priv->instance_flags ^ flags) & NM_CLIENT_INSTANCE_FLAGS_NO_AUTO_FETCH_PERMISSIONS) { + if (NM_FLAGS_HAS (flags, NM_CLIENT_INSTANCE_FLAGS_NO_AUTO_FETCH_PERMISSIONS)) + priv->instance_flags |= NM_CLIENT_INSTANCE_FLAGS_NO_AUTO_FETCH_PERMISSIONS; + else + priv->instance_flags &= ~NM_CLIENT_INSTANCE_FLAGS_NO_AUTO_FETCH_PERMISSIONS; + if (priv->dbsid_nm_check_permissions != 0) + _dbus_check_permissions_start (self); + } } break; @@ -7268,6 +7337,8 @@ nm_client_init (NMClient *self) { NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (self); + priv->permissions_state = NM_TERNARY_DEFAULT; + priv->context_busy_watcher = g_object_new (G_TYPE_OBJECT, NULL); c_list_init (&self->obj_base.queue_notify_lst); @@ -7522,9 +7593,14 @@ nm_client_class_init (NMClientClass *client_class) * NMClient:instance-flags: * * #NMClientInstanceFlags for the instance. These affect behavior of #NMClient. - * This is a construct property and you may only set the flags during + * This is a construct property and you may only set most flags only during * construction. * + * The flag %NM_CLIENT_INSTANCE_FLAGS_NO_AUTO_FETCH_PERMISSIONS can be toggled any time, + * even after constructing the instance. Note that you may want to watch NMClient:permissions-state + * property to know whether permissions are ready. Note that permissions are only fetched + * when NMClient has a D-Bus name owner. + * * Since: 1.24 */ obj_properties[PROP_INSTANCE_FLAGS] = @@ -7896,6 +7972,32 @@ nm_client_class_init (NMClientClass *client_class) G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + /** + * NMClient:permissions-state: + * + * The state of the cached permissions. The value %NM_TERNARY_DEFAULT + * means that no permissions are yet received (or not yet requested). + * %NM_TERNARY_TRUE means that permissions are received, cached and up + * to date. %NM_TERNARY_FALSE means that permissions were received and are + * cached, but in the meantime a "CheckPermissions" signal was received + * that invalidated the cached permissions. + * Note that NMClient will always emit a notify::permissions-state signal + * when a "CheckPermissions" signal got received or after new permissions + * got received (that is regardless whether the value of the permission state + * actually changed). With this you can watch the permissions-state property + * to know whether the permissions are ready. Note that while NMClient has + * no D-Bus name owner, no permissions are fetched (and this property won't + * change). + * + * Since: 1.24 + */ + obj_properties[PROP_PERMISSIONS_STATE] = + g_param_spec_enum (NM_CLIENT_PERMISSIONS_STATE, "", "", + NM_TYPE_TERNARY, + NM_TERNARY_DEFAULT, + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS); + _nml_dbus_meta_class_init_with_properties (object_class, &_nml_dbus_meta_iface_nm, &_nml_dbus_meta_iface_nm_settings, &_nml_dbus_meta_iface_nm_dnsmanager); diff --git a/libnm/nm-client.h b/libnm/nm-client.h index 4dc1a16791..37bac38b8b 100644 --- a/libnm/nm-client.h +++ b/libnm/nm-client.h @@ -18,11 +18,18 @@ G_BEGIN_DECLS /** * NMClientInstanceFlags: * @NM_CLIENT_INSTANCE_FLAGS_NONE: special value to indicate no flags. + * @NM_CLIENT_INSTANCE_FLAGS_NO_AUTO_FETCH_PERMISSIONS: by default, NMClient + * will fetch the permissions via "GetPermissions" and refetch them when + * "CheckPermissions" signal gets received. By setting this flag, this behavior + * can be disabled. You can toggle this flag to enable and disable automatic + * fetching of the permissions. Watch also nm_client_get_permissions_state() + * to know whether the permissions are up to date. * * Since: 1.24 */ typedef enum { /*< flags >*/ - NM_CLIENT_INSTANCE_FLAGS_NONE = 0, + NM_CLIENT_INSTANCE_FLAGS_NONE = 0, + NM_CLIENT_INSTANCE_FLAGS_NO_AUTO_FETCH_PERMISSIONS = 1, } NMClientInstanceFlags; #define NM_TYPE_CLIENT (nm_client_get_type ()) @@ -74,6 +81,7 @@ _NM_DEPRECATED_SYNC_WRITABLE_PROPERTY #define NM_CLIENT_DNS_RC_MANAGER "dns-rc-manager" #define NM_CLIENT_DNS_CONFIGURATION "dns-configuration" #define NM_CLIENT_CHECKPOINTS "checkpoints" +#define NM_CLIENT_PERMISSIONS_STATE "permissions-state" #define NM_CLIENT_DEVICE_ADDED "device-added" #define NM_CLIENT_DEVICE_REMOVED "device-removed" @@ -228,6 +236,9 @@ gboolean nm_client_set_logging (NMClient *client, NMClientPermissionResult nm_client_get_permission_result (NMClient *client, NMClientPermission permission); +NM_AVAILABLE_IN_1_24 +NMTernary nm_client_get_permissions_state (NMClient *self); + NMConnectivityState nm_client_get_connectivity (NMClient *client); _NM_DEPRECATED_SYNC_METHOD diff --git a/libnm/nm-libnm-utils.h b/libnm/nm-libnm-utils.h index 5dea53c682..7f984de2a5 100644 --- a/libnm/nm-libnm-utils.h +++ b/libnm/nm-libnm-utils.h @@ -166,7 +166,7 @@ typedef enum { /*****************************************************************************/ -#define NM_CLIENT_INSTANCE_FLAGS_ALL ((NMClientInstanceFlags) 0x0) +#define NM_CLIENT_INSTANCE_FLAGS_ALL ((NMClientInstanceFlags) 0x1) typedef struct { GType (*get_o_type_fcn) (void); From 44c5331e29d86808b9f8d9e210689183d89401bd Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 6 Dec 2019 13:31:56 +0100 Subject: [PATCH 056/109] shared: move "shared/nm-utils/tests/test-shared-general" to "shared/nm-glib-aux/tests" "shared/nm-utils" got long renamed and split into separate parts. The remaining tests are really to test nm-std-aux and nm-glib-aux (no libnm dependencies). Move the tests to the appropriate place. --- .gitignore | 3 ++- Makefile.am | 10 +++++----- shared/meson.build | 2 +- shared/{nm-utils => nm-glib-aux}/tests/meson.build | 2 +- .../tests/test-shared-general.c | 0 5 files changed, 9 insertions(+), 8 deletions(-) rename shared/{nm-utils => nm-glib-aux}/tests/meson.build (92%) rename shared/{nm-utils => nm-glib-aux}/tests/test-shared-general.c (100%) diff --git a/.gitignore b/.gitignore index 7ef42f5c4b..8b8b7fad51 100644 --- a/.gitignore +++ b/.gitignore @@ -128,7 +128,7 @@ test-*.trs /examples/C/qt/monitor-nm-running /examples/C/qt/monitor-nm-running.moc -/shared/nm-utils/tests/test-shared-general +/shared/nm-glib-aux/tests/test-shared-general /shared/nm-version-macros.h /introspection/org.freedesktop.NetworkManager*.[ch] @@ -325,6 +325,7 @@ test-*.trs /libnm/tests/test-general /policy/org.freedesktop.NetworkManager.policy /policy/org.freedesktop.NetworkManager.policy.in +/shared/nm-utils/tests/test-shared-general /src/devices/tests/test-arping /src/devices/wifi/tests/test-general /src/devices/wifi/tests/test-wifi-ap-utils diff --git a/Makefile.am b/Makefile.am index ecacf568e6..451f36e553 100644 --- a/Makefile.am +++ b/Makefile.am @@ -526,14 +526,14 @@ $(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS): $(libnm_core_lib_h_ ############################################################################### EXTRA_DIST += \ - shared/nm-utils/tests/meson.build \ + shared/nm-glib-aux/tests/meson.build \ $(NULL) ############################################################################### -check_programs += shared/nm-utils/tests/test-shared-general +check_programs += shared/nm-glib-aux/tests/test-shared-general -shared_nm_utils_tests_test_shared_general_CPPFLAGS = \ +shared_nm_glib_aux_tests_test_shared_general_CPPFLAGS = \ $(dflt_cppflags) \ -I$(srcdir)/shared \ -DNETWORKMANAGER_COMPILATION_TEST \ @@ -543,12 +543,12 @@ shared_nm_utils_tests_test_shared_general_CPPFLAGS = \ $(SANITIZER_LIB_CFLAGS) \ $(NULL) -shared_nm_utils_tests_test_shared_general_LDFLAGS = \ +shared_nm_glib_aux_tests_test_shared_general_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_EXEC_LDFLAGS) \ $(NULL) -shared_nm_utils_tests_test_shared_general_LDADD = \ +shared_nm_glib_aux_tests_test_shared_general_LDADD = \ shared/nm-glib-aux/libnm-glib-aux.la \ shared/systemd/libnm-systemd-logging-stub.la \ shared/nm-std-aux/libnm-std-aux.la \ diff --git a/shared/meson.build b/shared/meson.build index 5f96d49dc6..88b2de8f09 100644 --- a/shared/meson.build +++ b/shared/meson.build @@ -256,5 +256,5 @@ libnm_systemd_logging_stub = static_library( ) if enable_tests - subdir('nm-utils/tests') + subdir('nm-glib-aux/tests') endif diff --git a/shared/nm-utils/tests/meson.build b/shared/nm-glib-aux/tests/meson.build similarity index 92% rename from shared/nm-utils/tests/meson.build rename to shared/nm-glib-aux/tests/meson.build index 1ee5efff95..37c5c1b44d 100644 --- a/shared/nm-utils/tests/meson.build +++ b/shared/nm-glib-aux/tests/meson.build @@ -14,7 +14,7 @@ exe = executable( ) test( - 'shared/nm-utils/' + test_unit, + 'shared/nm-glib-aux/' + test_unit, test_script, args: test_args + [exe.full_path()], timeout: default_test_timeout, diff --git a/shared/nm-utils/tests/test-shared-general.c b/shared/nm-glib-aux/tests/test-shared-general.c similarity index 100% rename from shared/nm-utils/tests/test-shared-general.c rename to shared/nm-glib-aux/tests/test-shared-general.c From 3843e0c87d1351f8fb2ecfb37a7a33172988aa04 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 6 Dec 2019 13:40:39 +0100 Subject: [PATCH 057/109] shared: add "shared/nm-libnm-aux" static library We have "shared/nm-libnm-core-aux", which is shared code that can be used by anybody (including libnm-core, src, libnm and clients). We have "clients/common", which are helper function for clients. But that implies that the code is inside "clients". I think it would be useful to have auxiliary code that extends libnm, but is not only usable by code in "clients". In other words, "shared/nm-libnm-aux" is a better place than "clients/common", and I think most of the functionality form "clients/common" should move there. --- Makefile.am | 37 ++++++++++++++++++++++++++++++ libnm/meson.build | 18 +++++++++++++++ shared/meson.build | 11 +++++---- shared/nm-libnm-aux/nm-libnm-aux.c | 5 ++++ shared/nm-libnm-aux/nm-libnm-aux.h | 6 +++++ 5 files changed, 72 insertions(+), 5 deletions(-) create mode 100644 shared/nm-libnm-aux/nm-libnm-aux.c create mode 100644 shared/nm-libnm-aux/nm-libnm-aux.h diff --git a/Makefile.am b/Makefile.am index 451f36e553..748c0c9ef2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -525,6 +525,43 @@ $(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS): $(libnm_core_lib_h_ ############################################################################### +noinst_LTLIBRARIES += shared/nm-libnm-aux/libnm-libnm-aux.la + +shared_nm_libnm_aux_libnm_libnm_aux_la_CPPFLAGS = \ + $(dflt_cppflags) \ + -I$(srcdir)/shared \ + -I$(builddir)/shared \ + -I$(srcdir)/libnm-core \ + -I$(builddir)/libnm-core \ + -I$(srcdir)/libnm \ + -I$(builddir)/libnm \ + $(CODE_COVERAGE_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(SANITIZER_LIB_CFLAGS) \ + -DG_LOG_DOMAIN=\""libnmc"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ + $(NULL) + +shared_nm_libnm_aux_libnm_libnm_aux_la_SOURCES = \ + shared/nm-libnm-aux/nm-libnm-aux.c \ + shared/nm-libnm-aux/nm-libnm-aux.h \ + $(NULL) + +shared_nm_libnm_aux_libnm_libnm_aux_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_LIB_LDFLAGS) \ + $(NULL) + +shared_nm_libnm_aux_libnm_libnm_aux_la_LIBADD = \ + $(GLIB_LIBS) \ + libnm/libnm.la \ + $(NULL) + +$(shared_nm_libnm_aux_libnm_libnm_aux_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(shared_nm_libnm_aux_libnm_libnm_aux_la_OBJECTS): $(libnm_lib_h_pub_mkenums) + +############################################################################### + EXTRA_DIST += \ shared/nm-glib-aux/tests/meson.build \ $(NULL) diff --git a/libnm/meson.build b/libnm/meson.build index 51ca46d2bc..7680b9ebe0 100644 --- a/libnm/meson.build +++ b/libnm/meson.build @@ -278,3 +278,21 @@ endif if enable_tests subdir('tests') endif + +libnm_libnm_aux = static_library( + 'nm-libnm-aux', + sources: nm_libnm_aux_source, + c_args: [ + '-DG_LOG_DOMAIN="@0@"'.format('libnmc'), + '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT', + ], + dependencies: [ + libnm_core_nm_default_dep, + libnm_dep, + ], +) + +libnm_libnm_aux_dep = declare_dependency( + include_directories: [shared_inc], + link_with: [libnm_libnm_aux], +) diff --git a/shared/meson.build b/shared/meson.build index 88b2de8f09..d6ba659bbd 100644 --- a/shared/meson.build +++ b/shared/meson.build @@ -111,6 +111,8 @@ nm_libnm_core_aux_source = files('nm-libnm-core-aux/nm-libnm-core-aux.c') nm_libnm_core_utils_source = files('nm-libnm-core-intern/nm-libnm-core-utils.c') +nm_libnm_aux_source = files('nm-libnm-aux/nm-libnm-aux.c') + nm_meta_setting_source = files('nm-meta-setting.c') nm_test_utils_impl_source = files('nm-test-utils-impl.c') @@ -168,15 +170,14 @@ libnm_utils_base_dep = declare_dependency( link_with: libnm_utils_base, ) -deps = [ - glib_nm_default_dep, - libudev_dep, -] libnm_udev_aux = static_library( 'nm-udev-aux', sources: 'nm-udev-aux/nm-udev-utils.c', - dependencies: deps, + dependencies: [ + glib_nm_default_dep, + libudev_dep, + ], c_args: c_flags, ) diff --git a/shared/nm-libnm-aux/nm-libnm-aux.c b/shared/nm-libnm-aux/nm-libnm-aux.c new file mode 100644 index 0000000000..2a6b6b22e2 --- /dev/null +++ b/shared/nm-libnm-aux/nm-libnm-aux.c @@ -0,0 +1,5 @@ +// SPDX-License-Identifier: LGPL-2.1+ + +#include "nm-default.h" + +#include "nm-libnm-aux.h" diff --git a/shared/nm-libnm-aux/nm-libnm-aux.h b/shared/nm-libnm-aux/nm-libnm-aux.h new file mode 100644 index 0000000000..66bf05b69b --- /dev/null +++ b/shared/nm-libnm-aux/nm-libnm-aux.h @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: LGPL-2.1+ + +#ifndef __NM_LIBNM_AUX_H__ +#define __NM_LIBNM_AUX_H__ + +#endif /* __NM_LIBNM_AUX_H__ */ From 9e10b4f699dbaa47b5773244157a3c9be1aa4eb4 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 6 Dec 2019 13:18:59 +0100 Subject: [PATCH 058/109] shared: add nmc_client_new_waitsync() and nmc_client_new_async*() helpers Benefits: - nmc_client_new_async*() allows to set properties on the NMClient instance before calling g_async_initable_init_async(). It also allows to subscribe to any signals (like NM_CLIENT_DEVICE_ADDED) before actually iterating the GMainContext. This is a sensible and supported thing to do! - nmc_client_new_waitsync() iterates the GMainContext until the (async) initialization is complete. That is different from synchronous nm_client_new(), which does not iterate the caller's GMainContext, and hence needs an internal context to ensure the order of events is honored. - nmc_client_new_waitsync() always returns the NMClient instance, even if initialization fails. That is useful if you need the nm_client_get_context_busy_watcher() instance to ensure all pending messages are completed. --- shared/nm-libnm-aux/nm-libnm-aux.c | 116 +++++++++++++++++++++++++++++ shared/nm-libnm-aux/nm-libnm-aux.h | 18 +++++ 2 files changed, 134 insertions(+) diff --git a/shared/nm-libnm-aux/nm-libnm-aux.c b/shared/nm-libnm-aux/nm-libnm-aux.c index 2a6b6b22e2..83b6f71b6b 100644 --- a/shared/nm-libnm-aux/nm-libnm-aux.c +++ b/shared/nm-libnm-aux/nm-libnm-aux.c @@ -3,3 +3,119 @@ #include "nm-default.h" #include "nm-libnm-aux.h" + +/*****************************************************************************/ + +NMClient * +nmc_client_new_async_valist (GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data, + const char *first_property_name, + va_list ap) +{ + NMClient *nmc; + + nmc = NM_CLIENT (g_object_new_valist (NM_TYPE_CLIENT, first_property_name, ap)); + g_async_initable_init_async (G_ASYNC_INITABLE (nmc), + G_PRIORITY_DEFAULT, + cancellable, + callback, + user_data); + return nmc; +} + +NMClient * +nmc_client_new_async (GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data, + const char *first_property_name, + ...) +{ + NMClient *nmc; + va_list ap; + + va_start (ap, first_property_name); + nmc = nmc_client_new_async_valist (cancellable, + callback, + user_data, + first_property_name, + ap); + va_end (ap); + return nmc; +} + +/*****************************************************************************/ + +typedef struct { + GMainLoop *main_loop; + NMClient *nmc; + GError *error; +} ClientCreateData; + +static void +_nmc_client_new_waitsync_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + ClientCreateData *data = user_data; + + g_async_initable_init_finish (G_ASYNC_INITABLE (source_object), + result, + &data->error); + g_main_loop_quit (data->main_loop); +} + +/** + * nmc_client_new: + * @cancellable: the cancellable to abort the creation. + * @out_nmc: (out): (transfer full): if give, transfers a reference + * to the NMClient instance. Note that this never fails to create + * the NMClient GObject, but depending on the return value, + * the instance was successfully initialized or not. + * @error: the error if creation fails. + * @first_property_name: the name of the first property + * @...: the value of the first property, followed optionally by more + * name/value pairs, followed by %NULL + * + * Returns: %TRUE, if the client was successfully initalized. + * + * This uses nm_client_new_async() to create a NMClient instance, + * but it iterates the current GMainContext until the client is + * ready. As such, it waits for the client creation to complete + * (like sync nm_client_new()) but it iterates the caller's GMainContext + * (unlike sync nm_client_new()). This is often preferable, because + * sync nm_client_new() needs to create an additional internal GMainContext + * that it can iterate instead. That has a performance overhead that + * is often unnecessary. + */ +gboolean +nmc_client_new_waitsync (GCancellable *cancellable, + NMClient **out_nmc, + GError **error, + const char *first_property_name, + ...) +{ + gs_unref_object NMClient *nmc = NULL; + nm_auto_unref_gmainloop GMainLoop *main_loop = g_main_loop_new (g_main_context_get_thread_default (), FALSE); + ClientCreateData data = { + .main_loop = main_loop, + }; + va_list ap; + + va_start (ap, first_property_name); + nmc = nmc_client_new_async_valist (cancellable, + _nmc_client_new_waitsync_cb, + &data, + first_property_name, + ap); + va_end (ap); + + g_main_loop_run (main_loop); + + NM_SET_OUT (out_nmc, g_steal_pointer (&nmc)); + if (data.error) { + g_propagate_error (error, data.error); + return FALSE; + } + return TRUE; +} diff --git a/shared/nm-libnm-aux/nm-libnm-aux.h b/shared/nm-libnm-aux/nm-libnm-aux.h index 66bf05b69b..a0aff19f28 100644 --- a/shared/nm-libnm-aux/nm-libnm-aux.h +++ b/shared/nm-libnm-aux/nm-libnm-aux.h @@ -3,4 +3,22 @@ #ifndef __NM_LIBNM_AUX_H__ #define __NM_LIBNM_AUX_H__ +NMClient *nmc_client_new_async_valist (GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data, + const char *first_property_name, + va_list ap); + +NMClient *nmc_client_new_async (GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data, + const char *first_property_name, + ...); + +gboolean nmc_client_new_waitsync (GCancellable *cancellable, + NMClient **out_nmc, + GError **error, + const char *first_property_name, + ...); + #endif /* __NM_LIBNM_AUX_H__ */ From 5859e9a53d8f2170ed468ea0d77020c5849c0f8c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 6 Dec 2019 13:02:31 +0100 Subject: [PATCH 059/109] tui: create NMClient instance via async init Using sync init (nm_client_new()) has an overhead as it requires an internal GMainContext to ensure preserving the order of D-Bus messages. Let's avoid that by using the async init. Note that the difference here is that we will iterate the caller's GMainContext while creating the instance. But that is no problem for nmtui at that point. --- Makefile.am | 1 + clients/tui/meson.build | 1 + clients/tui/nmtui.c | 8 ++++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 748c0c9ef2..6c29e44ff2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4640,6 +4640,7 @@ clients_tui_nmtui_LDADD = \ clients/tui/newt/libnmt-newt.a \ clients/common/libnmc.la \ clients/common/libnmc-base.la \ + shared/nm-libnm-aux/libnm-libnm-aux.la \ shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ shared/nm-glib-aux/libnm-glib-aux.la \ diff --git a/clients/tui/meson.build b/clients/tui/meson.build index 8948d6ff35..db6bd429fd 100644 --- a/clients/tui/meson.build +++ b/clients/tui/meson.build @@ -51,6 +51,7 @@ deps = [ libnmc_base_dep, libnmc_dep, libnmt_newt_dep, + libnm_libnm_aux_dep, ] executable( diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c index e9d2ab506b..dcd8973772 100644 --- a/clients/tui/nmtui.c +++ b/clients/tui/nmtui.c @@ -18,6 +18,8 @@ #include #include +#include "nm-libnm-aux/nm-libnm-aux.h" + #include "nmt-newt.h" #include "nm-editor-bindings.h" @@ -231,8 +233,10 @@ main (int argc, char **argv) nm_editor_bindings_init (); - nm_client = nm_client_new (NULL, &error); - if (!nm_client) { + if (!nmc_client_new_waitsync (NULL, + &nm_client, + &error, + NULL)) { g_printerr (_("Could not contact NetworkManager: %s.\n"), error->message); g_error_free (error); exit (1); From b6c83d18e439d5221e75d99f1b6f3b77d00d2ff1 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 6 Dec 2019 15:59:27 +0100 Subject: [PATCH 060/109] tui: don't fetch permissions for NMClient in nmtui nmtui doesn't care about the permissions. Don't fetch them. --- clients/tui/nmtui.c | 1 + 1 file changed, 1 insertion(+) diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c index dcd8973772..a6ea6f7f52 100644 --- a/clients/tui/nmtui.c +++ b/clients/tui/nmtui.c @@ -236,6 +236,7 @@ main (int argc, char **argv) if (!nmc_client_new_waitsync (NULL, &nm_client, &error, + NM_CLIENT_INSTANCE_FLAGS, (guint) NM_CLIENT_INSTANCE_FLAGS_NO_AUTO_FETCH_PERMISSIONS, NULL)) { g_printerr (_("Could not contact NetworkManager: %s.\n"), error->message); g_error_free (error); From c5c7fffda839a9aa0a013a482d55d2386814b120 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 6 Dec 2019 13:52:29 +0100 Subject: [PATCH 061/109] cloud-setup: reuse nmc_client_new_waitsync() to create NMClient instance --- Makefile.am | 1 + clients/cloud-setup/main.c | 75 +++++++++------------------------ clients/cloud-setup/meson.build | 13 +++--- 3 files changed, 27 insertions(+), 62 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6c29e44ff2..4f690a5c0e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4707,6 +4707,7 @@ clients_cloud_setup_nm_cloud_setup_LDFLAGS = \ $(NULL) clients_cloud_setup_nm_cloud_setup_LDADD = \ + shared/nm-libnm-aux/libnm-libnm-aux.la \ shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ shared/nm-glib-aux/libnm-glib-aux.la \ diff --git a/clients/cloud-setup/main.c b/clients/cloud-setup/main.c index 8250945c47..2ba10285b6 100644 --- a/clients/cloud-setup/main.c +++ b/clients/cloud-setup/main.c @@ -2,8 +2,9 @@ #include "nm-default.h" -#include "nm-cloud-setup-utils.h" +#include "nm-libnm-aux/nm-libnm-aux.h" +#include "nm-cloud-setup-utils.h" #include "nmcs-provider-ec2.h" #include "nm-libnm-core-intern/nm-libnm-core-utils.h" @@ -122,58 +123,6 @@ out: /*****************************************************************************/ -typedef struct { - GMainLoop *main_loop; - NMClient *nmc; -} ClientCreateData; - -static void -_nmc_create_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) -{ - gs_unref_object NMClient *nmc = NULL; - ClientCreateData *data = user_data; - gs_free_error GError *error = NULL; - - nmc = nm_client_new_finish (result, &error); - if (!nmc) { - if (!nm_utils_error_is_cancelled (error, FALSE)) - _LOGI ("failure to talk to NetworkManager: %s", error->message); - goto out; - } - - if (!nm_client_get_nm_running (nmc)) { - _LOGI ("NetworkManager is not running"); - goto out; - } - - _LOGD ("NetworkManager is running"); - nmcs_wait_for_objects_register (nmc); - nmcs_wait_for_objects_register (nm_client_get_context_busy_watcher (nmc)); - - data->nmc = g_steal_pointer (&nmc); -out: - g_main_loop_quit (data->main_loop); -} - -static NMClient * -_nmc_create (GCancellable *sigterm_cancellable) -{ - nm_auto_unref_gmainloop GMainLoop *main_loop = g_main_loop_new (NULL, FALSE); - ClientCreateData data = { - .main_loop = main_loop, - }; - - nm_client_new_async (sigterm_cancellable, _nmc_create_cb, &data); - - g_main_loop_run (main_loop); - - return data.nmc; -} - -/*****************************************************************************/ - static char ** _nmc_get_hwaddrs (NMClient *nmc) { @@ -593,6 +542,7 @@ main (int argc, const char *const*argv) gs_unref_object NMCSProvider *provider = NULL; gs_unref_object NMClient *nmc = NULL; gs_unref_hashtable GHashTable *config_dict = NULL; + gs_free_error GError *error = NULL; _nm_logging_enabled_init (g_getenv (NMCS_ENV_VARIABLE ("NM_CLOUD_SETUP_LOG"))); @@ -616,9 +566,24 @@ main (int argc, const char *const*argv) if (!provider) goto done; - nmc = _nmc_create (sigterm_cancellable); - if (!nmc) + nmc_client_new_waitsync (sigterm_cancellable, + &nmc, + &error, + NULL); + + nmcs_wait_for_objects_register (nmc); + nmcs_wait_for_objects_register (nm_client_get_context_busy_watcher (nmc)); + + if (error) { + if (!nm_utils_error_is_cancelled (error, FALSE)) + _LOGI ("failure to talk to NetworkManager: %s", error->message); goto done; + } + + if (!nm_client_get_nm_running (nmc)) { + _LOGI ("NetworkManager is not running"); + goto done; + } config_dict = _get_config (sigterm_cancellable, provider, nmc); if (!config_dict) diff --git a/clients/cloud-setup/meson.build b/clients/cloud-setup/meson.build index e9cd970a36..b0a6191c46 100644 --- a/clients/cloud-setup/meson.build +++ b/clients/cloud-setup/meson.build @@ -29,16 +29,15 @@ sources = files( 'nmcs-provider.c', ) -deps = [ - libnmc_base_dep, - libnmc_dep, - libcurl_dep, -] - executable( name, sources, - dependencies: deps, + dependencies: [ + libnmc_base_dep, + libnmc_dep, + libcurl_dep, + libnm_libnm_aux_dep, + ], c_args: clients_c_flags + ['-DG_LOG_DOMAIN="@0@"'.format(name)], link_with: libnm_systemd_logging_stub, From b78e5cf45c38604f247c6787071f4bf6a2d2f73d Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 6 Dec 2019 16:00:40 +0100 Subject: [PATCH 062/109] cloud-setup: don't fetch permissions for NMClient in nm-cloud-setup nm-cloud-setup doesn't care about the permissions. Don't fetch them. --- clients/cloud-setup/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/clients/cloud-setup/main.c b/clients/cloud-setup/main.c index 2ba10285b6..743f931c0f 100644 --- a/clients/cloud-setup/main.c +++ b/clients/cloud-setup/main.c @@ -569,6 +569,7 @@ main (int argc, const char *const*argv) nmc_client_new_waitsync (sigterm_cancellable, &nmc, &error, + NM_CLIENT_INSTANCE_FLAGS, (guint) NM_CLIENT_INSTANCE_FLAGS_NO_AUTO_FETCH_PERMISSIONS, NULL); nmcs_wait_for_objects_register (nmc); From 0b5e72b90d99e6af567e5ca3fa7801882194df8f Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 6 Dec 2019 17:09:18 +0100 Subject: [PATCH 063/109] nm-online: use nmc_client_new_async() instead of nm_client_new_async() This will allow us to set construct parameters to the instance, like NM_CLIENT_INSTANCE_FLAGS. --- Makefile.am | 1 + clients/meson.build | 11 +++++------ clients/nm-online.c | 19 +++++++++++++------ 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4f690a5c0e..fb9a3dd2e6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4216,6 +4216,7 @@ clients_nm_online_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" clients_nm_online_LDADD = \ + shared/nm-libnm-aux/libnm-libnm-aux.la \ libnm/libnm.la \ $(GLIB_LIBS) diff --git a/clients/meson.build b/clients/meson.build index 69e0bfef2b..8b2fa4421b 100644 --- a/clients/meson.build +++ b/clients/meson.build @@ -2,15 +2,14 @@ clients_c_flags = ['-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_C name = 'nm-online' -deps = [ - libnm_dep, - libnm_nm_default_dep, -] - executable( name, name + '.c', - dependencies: deps, + dependencies: [ + libnm_dep, + libnm_nm_default_dep, + libnm_libnm_aux_dep, + ], c_args: clients_c_flags + ['-DG_LOG_DOMAIN="@0@"'.format(name)], link_args: ldflags_linker_script_binary, link_depends: linker_script_binary, diff --git a/clients/nm-online.c b/clients/nm-online.c index de9c3794f0..014be11165 100644 --- a/clients/nm-online.c +++ b/clients/nm-online.c @@ -23,6 +23,8 @@ #include #include +#include "nm-libnm-aux/nm-libnm-aux.h" + #define PROGRESS_STEPS 15 #define EXIT_NONE -1 @@ -198,13 +200,16 @@ got_client (GObject *source_object, GAsyncResult *res, gpointer user_data) { OnlineData *data = user_data; gs_free_error GError *error = NULL; - NMClient *client; + + nm_assert (NM_IS_CLIENT (source_object)); + nm_assert (NM_CLIENT (source_object) == data->client); nm_clear_g_source (&data->client_new_timeout_id); g_clear_object (&data->client_new_cancellable); - client = nm_client_new_finish (res, &error); - if (!client) { + if (!g_async_initable_init_finish (G_ASYNC_INITABLE (source_object), + res, + &error)) { if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) return; data->quiet = TRUE; @@ -214,8 +219,6 @@ got_client (GObject *source_object, GAsyncResult *res, gpointer user_data) return; } - data->client = client; - if (quit_if_connected (data)) return; @@ -285,7 +288,11 @@ main (int argc, char *argv[]) data.client_new_cancellable = g_cancellable_new (); data.client_new_timeout_id = g_timeout_add_seconds (30, got_client_timeout, &data); - nm_client_new_async (data.client_new_cancellable, got_client, &data); + + data.client = nmc_client_new_async (data.client_new_cancellable, + got_client, + &data, + NULL); g_main_loop_run (data.loop); From 00461632015714f87b9c6ea2524b823875bcca1b Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 6 Dec 2019 17:16:38 +0100 Subject: [PATCH 064/109] nm-online: don't fetch permissions for NMClient in nm-online nm-online doesn't care about the permissions. Don't fetch them. --- clients/nm-online.c | 1 + 1 file changed, 1 insertion(+) diff --git a/clients/nm-online.c b/clients/nm-online.c index 014be11165..9ea57641cb 100644 --- a/clients/nm-online.c +++ b/clients/nm-online.c @@ -292,6 +292,7 @@ main (int argc, char *argv[]) data.client = nmc_client_new_async (data.client_new_cancellable, got_client, &data, + NM_CLIENT_INSTANCE_FLAGS, (guint) NM_CLIENT_INSTANCE_FLAGS_NO_AUTO_FETCH_PERMISSIONS, NULL); g_main_loop_run (data.loop); From 3035837aa8abee4eaab4fd5c2a9bbd076db41cfe Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 6 Dec 2019 17:09:18 +0100 Subject: [PATCH 065/109] cli: use nmc_client_new_async() instead of nm_client_new_async() This will allow us to set construct parameters to the instance, like NM_CLIENT_INSTANCE_FLAGS. --- Makefile.am | 1 + clients/cli/common.c | 16 +++++++++++++--- clients/cli/meson.build | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index fb9a3dd2e6..8b75426009 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4439,6 +4439,7 @@ clients_cli_nmcli_LDADD = \ shared/nm-glib-aux/libnm-glib-aux.la \ shared/nm-std-aux/libnm-std-aux.la \ shared/libcsiphash.la \ + shared/nm-libnm-aux/libnm-libnm-aux.la \ libnm/libnm.la \ $(GLIB_LIBS) \ $(READLINE_LIBS) diff --git a/clients/cli/common.c b/clients/cli/common.c index 04ccf8dc1f..88be4376ef 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -13,6 +13,8 @@ #include #include +#include "nm-libnm-aux/nm-libnm-aux.h" + #include "nm-vpn-helpers.h" #include "nm-client-utils.h" @@ -1216,17 +1218,22 @@ got_client (GObject *source_object, GAsyncResult *res, gpointer user_data) CmdCall *call = user_data; NmCli *nmc; + nm_assert (NM_IS_CLIENT (source_object)); + task = g_steal_pointer (&call->task); nmc = g_task_get_task_data (task); nmc->should_wait--; - nmc->client = nm_client_new_finish (res, &error); - if (!nmc->client) { + if (!g_async_initable_init_finish (G_ASYNC_INITABLE (source_object), + res, + &error)) { + g_object_unref (source_object); g_task_return_new_error (task, NMCLI_ERROR, NMC_RESULT_ERROR_UNKNOWN, _("Error: Could not create NMClient object: %s."), error->message); } else { + nmc->client = NM_CLIENT (source_object); call_cmd (nmc, g_steal_pointer (&task), call->cmd, call->argc, call->argv); } @@ -1259,7 +1266,10 @@ call_cmd (NmCli *nmc, GTask *task, const NMCCommand *cmd, int argc, char **argv) call->argc = argc; call->argv = argv; call->task = task; - nm_client_new_async (NULL, got_client, call); + nmc_client_new_async (NULL, + got_client, + call, + NULL); } } diff --git a/clients/cli/meson.build b/clients/cli/meson.build index 562020630d..1c8148920c 100644 --- a/clients/cli/meson.build +++ b/clients/cli/meson.build @@ -22,11 +22,11 @@ deps = [ libnmc_base_dep, libnmc_dep, readline_dep, + libnm_libnm_aux_dep, ] if enable_polkit_agent sources += nm_polkit_listener - deps += polkit_agent_dep endif From 030e1472f4235ec253735336a743826b8540be19 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 6 Dec 2019 17:38:26 +0100 Subject: [PATCH 066/109] cli: don't fetch permissions for NMClient in nmcli unless required This avoids unnecessarily fetching permissions, which are not needed most of the time. During `nmcli general permissions` we require to fetch the permissions. This is now solved better, because previously the code waited for any permissions to be not UNKNOWN. That was a hack, because there are cases where all permissions would be UNKNOWN (hidepid mount option) and nmcli would hang. There is a downside too: for `nmcli general permissions` we now first need to wait for NMClient to initialize, before starting to fetch permissions. Previously, we would call GetPermissions() in parallel with initializing NMClient. It now takes longer. That should be fixed be refactoring the code in nmcli to not wait for NMClient to be fully initialized, before requesting the permissions. --- clients/cli/common.c | 1 + clients/cli/general.c | 92 ++++++++++++++++++++++++------------------- 2 files changed, 53 insertions(+), 40 deletions(-) diff --git a/clients/cli/common.c b/clients/cli/common.c index 88be4376ef..b5e684cecb 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -1269,6 +1269,7 @@ call_cmd (NmCli *nmc, GTask *task, const NMCCommand *cmd, int argc, char **argv) nmc_client_new_async (NULL, got_client, call, + NM_CLIENT_INSTANCE_FLAGS, (guint) NM_CLIENT_INSTANCE_FLAGS_NO_AUTO_FETCH_PERMISSIONS, NULL); } } diff --git a/clients/cli/general.c b/clients/cli/general.c index da8437f0ed..ccda0d52e3 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -22,6 +22,12 @@ /*****************************************************************************/ +static void permission_changed (GObject *gobject, + GParamSpec *pspec, + NmCli *nmc); + +/*****************************************************************************/ + NM_UTILS_LOOKUP_STR_DEFINE_STATIC (nm_state_to_string, NMState, NM_UTILS_LOOKUP_DEFAULT (N_("unknown")), NM_UTILS_LOOKUP_ITEM (NM_STATE_ASLEEP, N_("asleep")), @@ -498,21 +504,46 @@ timeout_cb (gpointer user_data) { NmCli *nmc = (NmCli *) user_data; + g_signal_handlers_disconnect_by_func (nmc->client, + G_CALLBACK (permission_changed), + nmc); + g_string_printf (nmc->return_text, _("Error: Timeout %d sec expired."), nmc->timeout); nmc->return_value = NMC_RESULT_ERROR_TIMEOUT_EXPIRED; quit (); return FALSE; } -static int +static void print_permissions (void *user_data) { NmCli *nmc = user_data; gs_free_error GError *error = NULL; const char *fields_str = NULL; gpointer permissions[G_N_ELEMENTS (nm_auth_permission_sorted) + 1]; + gboolean is_running; int i; + is_running = nm_client_get_nm_running (nmc->client); + + if ( is_running + && nm_client_get_permissions_state (nmc->client) != NM_TERNARY_TRUE) { + /* wait longer. Permissions are not up to date. */ + return; + } + + g_signal_handlers_disconnect_by_func (nmc->client, + G_CALLBACK (permission_changed), + nmc); + + if (!is_running) { + /* NetworkManager quit while we were waiting. */ + g_string_printf (nmc->return_text, _("NetworkManager is not running.")); + nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING; + quit (); + return; + } + if (!nmc->required_fields || strcasecmp (nmc->required_fields, "common") == 0) { } else if (strcasecmp (nmc->required_fields, "all") == 0) { } else @@ -536,62 +567,43 @@ print_permissions (void *user_data) } quit (); - return G_SOURCE_REMOVE; -} - -static gboolean -got_permissions (NmCli *nmc) -{ - NMClientPermission perm; - - /* The server returns all the permissions at once, so if at least one is there - * we already received the reply. - * - * FIXME: this is wrong, because all permissions could be unknown. We should instead - * have a signal in NMClient to indicate when permissions are received. */ - for (perm = NM_CLIENT_PERMISSION_NONE + 1; perm <= NM_CLIENT_PERMISSION_LAST; perm++) { - if (nm_client_get_permission_result (nmc->client, perm) != NM_CLIENT_PERMISSION_RESULT_UNKNOWN) - return TRUE; - } - - return FALSE; } static void -permission_changed (NMClient *client, - NMClientPermission permission, - NMClientPermissionResult result, +permission_changed (GObject *gobject, + GParamSpec *pspec, NmCli *nmc) { - if (got_permissions (nmc)) { - /* Defer the printing, so that we have a chance to process the other - * permission-changed signals. */ - g_signal_handlers_disconnect_by_func (nmc->client, - G_CALLBACK (permission_changed), - nmc); - g_idle_remove_by_data (nmc); - g_idle_add (print_permissions, nmc); - } + if (NM_IN_STRSET (pspec->name, NM_CLIENT_NM_RUNNING, + NM_CLIENT_PERMISSIONS_STATE)) + print_permissions (nmc); } static gboolean show_nm_permissions (NmCli *nmc) { - /* The permissions are available now, just print them. */ - if (got_permissions (nmc)) { - print_permissions (nmc); - return TRUE; - } + NMClientInstanceFlags instance_flags; - /* The client didn't get the permissions reply yet. Subscribe to changes. */ - g_signal_connect (nmc->client, NM_CLIENT_PERMISSION_CHANGED, - G_CALLBACK (permission_changed), nmc); + instance_flags = nm_client_get_instance_flags (nmc->client); + instance_flags &= ~NM_CLIENT_INSTANCE_FLAGS_NO_AUTO_FETCH_PERMISSIONS; + + g_object_set (nmc->client, + NM_CLIENT_INSTANCE_FLAGS, (guint) instance_flags, + NULL); + + g_signal_connect (nmc->client, + "notify", + G_CALLBACK (permission_changed), + nmc); if (nmc->timeout == -1) nmc->timeout = 10; g_timeout_add_seconds (nmc->timeout, timeout_cb, nmc); nmc->should_wait++; + + print_permissions (nmc); + return TRUE; } From cb755afa2409611e4691609743d4ee8841b75bc5 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 6 Dec 2019 18:57:28 +0100 Subject: [PATCH 067/109] clients: in debug builds randomly use sync init of NMClient for testing This affects nmtui and nm-cloud-setup, which use nmc_client_new_waitsync(). --- shared/nm-libnm-aux/nm-libnm-aux.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/shared/nm-libnm-aux/nm-libnm-aux.c b/shared/nm-libnm-aux/nm-libnm-aux.c index 83b6f71b6b..169416b9c4 100644 --- a/shared/nm-libnm-aux/nm-libnm-aux.c +++ b/shared/nm-libnm-aux/nm-libnm-aux.c @@ -102,6 +102,31 @@ nmc_client_new_waitsync (GCancellable *cancellable, }; va_list ap; +#if NM_MORE_ASSERTS > 10 + /* The sync initialization of NMClient is generally a bad idea, because it + * brings the overhead of an additional GMainContext. Anyway, since our own + * code no longer uses that, we hardly test those code paths. But they should + * work just the same. Randomly use instead the sync initialization in a debug + * build... */ + if ((g_random_int () % 2) == 0) { + gboolean success; + + va_start (ap, first_property_name); + nmc = NM_CLIENT (g_object_new_valist (NM_TYPE_CLIENT, first_property_name, ap)); + va_end (ap); + + /* iterate the context at least once, just so that the behavior from POV of the + * caller is roughly the same. */ + g_main_context_iteration (nm_client_get_main_context (nmc), FALSE); + + success = g_initable_init (G_INITABLE (nmc), + cancellable, + error); + NM_SET_OUT (out_nmc, g_steal_pointer (&nmc)); + return success; + } +#endif + va_start (ap, first_property_name); nmc = nmc_client_new_async_valist (cancellable, _nmc_client_new_waitsync_cb, From 3d07708f594ed5f164dfc6f8b04a376c762b8a48 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 10 Dec 2019 16:39:44 +0100 Subject: [PATCH 068/109] doc: clarify default values for ipv4.mdns and ipv4.llmnr settings LLMNR and mDNS settings can have their global default value configured in "NetworkManager.conf". Global default values should work the way that all regular values of the property can be configured explicitly in the connection profile. The special "default" value only indicates to allow lookup of the global default, but it should not have a meaning of its own. Note that if mDNS/LLMNR settings are left unspecified, we will set the argument to SetLinkMulticastDNS() and SetLinkLLMNR() functions to "", which means that systemd-resolved decides on a default. Also, depending on the DNS plugin, the default value differs. This is all fine however. In this case, the ultimate default value depends on other things (like the DNS plugin), but each possible value is in fact explicitly configurable. We also do that for "ipv6.ip6-privacy". Anyway, cleanup the documentation a bit and try to better explain what the default is. --- clients/common/settings-docs.h.in | 4 ++-- libnm-core/nm-setting-connection.c | 27 ++++++++++++++++----------- man/NetworkManager.conf.xml | 2 ++ 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in index 616b0c15d4..57e9ab2a48 100644 --- a/clients/common/settings-docs.h.in +++ b/clients/common/settings-docs.h.in @@ -140,9 +140,9 @@ #define DESCRIBE_DOC_NM_SETTING_CONNECTION_ID N_("A human readable unique identifier for the connection, like \"Work Wi-Fi\" or \"T-Mobile 3G\".") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_INTERFACE_NAME N_("The name of the network interface this connection is bound to. If not set, then the connection can be attached to any interface of the appropriate type (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_LLDP N_("Whether LLDP is enabled for the connection.") -#define DESCRIBE_DOC_NM_SETTING_CONNECTION_LLMNR N_("Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: yes: register hostname and resolving for the connection, no: disable LLMNR for the interface, resolve: do not register hostname but allow resolving of LLMNR host names. This feature requires a plugin which supports LLMNR. One such plugin is dns-systemd-resolved.") +#define DESCRIBE_DOC_NM_SETTING_CONNECTION_LLMNR N_("Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: \"yes\" (2) register hostname and resolving for the connection, \"no\" (0) disable LLMNR for the interface, \"resolve\" (1) do not register hostname but allow resolving of LLMNR host names If unspecified, \"default\" ultimately depends on the DNS plugin (which for systemd-resolved currently means \"yes\"). This feature requires a plugin which supports LLMNR. Otherwise the setting has no effect. One such plugin is dns-systemd-resolved.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_MASTER N_("Interface name of the master device or UUID of the master connection.") -#define DESCRIBE_DOC_NM_SETTING_CONNECTION_MDNS N_("Whether mDNS is enabled for the connection. The permitted values are: yes: register hostname and resolving for the connection, no: disable mDNS for the interface, resolve: do not register hostname but allow resolving of mDNS host names. This feature requires a plugin which supports mDNS. One such plugin is dns-systemd-resolved.") +#define DESCRIBE_DOC_NM_SETTING_CONNECTION_MDNS N_("Whether mDNS is enabled for the connection. The permitted values are: \"yes\" (2) register hostname and resolving for the connection, \"no\" (0) disable mDNS for the interface, \"resolve\" (1) do not register hostname but allow resolving of mDNS host names and \"default\" (-1) to allow lookup of a global default in NetworkManager.conf. If unspecified, \"default\" ultimately depends on the DNS plugin (which for systemd-resolved currently means \"no\"). This feature requires a plugin which supports mDNS. Otherwise the setting has no effect. One such plugin is dns-systemd-resolved.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_METERED N_("Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_MULTI_CONNECT N_("Specifies whether the profile can be active multiple times at a particular moment. The value is of type NMConnectionMultiConnect.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_PERMISSIONS N_("An array of strings defining what access a given user has to this connection. If this is NULL or empty, all users are allowed to access this connection; otherwise users are allowed if and only if they are in this list. When this is not empty, the connection can be active only when one of the specified users is logged into an active session. Each entry is of the form \"[type]:[id]:[reserved]\"; for example, \"user:dcbw:blah\". At this time only the \"user\" [type] is allowed. Any other values are ignored and reserved for future use. [id] is the username that this permission refers to, which may not contain the \":\" character. Any [reserved] information present must be ignored and is reserved for future use. All of [type], [id], and [reserved] must be valid UTF-8.") diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c index a13e3f237a..ef33ecc138 100644 --- a/libnm-core/nm-setting-connection.c +++ b/libnm-core/nm-setting-connection.c @@ -2173,13 +2173,16 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass) * * Whether mDNS is enabled for the connection. * - * The permitted values are: yes: register hostname and resolving - * for the connection, no: disable mDNS for the interface, resolve: - * do not register hostname but allow resolving of mDNS host names. - * - * This feature requires a plugin which supports mDNS. One such - * plugin is dns-systemd-resolved. + * The permitted values are: "yes" (2) register hostname and resolving + * for the connection, "no" (0) disable mDNS for the interface, "resolve" + * (1) do not register hostname but allow resolving of mDNS host names + * and "default" (-1) to allow lookup of a global default in NetworkManager.conf. + * If unspecified, "default" ultimately depends on the DNS plugin (which + * for systemd-resolved currently means "no"). * + * This feature requires a plugin which supports mDNS. Otherwise the + * setting has no effect. One such plugin is dns-systemd-resolved. +* * Since: 1.12 **/ /* ---ifcfg-rh--- @@ -2206,12 +2209,14 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass) * System (DNS) packet format that allows both IPv4 and IPv6 hosts * to perform name resolution for hosts on the same local link. * - * The permitted values are: yes: register hostname and resolving - * for the connection, no: disable LLMNR for the interface, resolve: - * do not register hostname but allow resolving of LLMNR host names. + * The permitted values are: "yes" (2) register hostname and resolving + * for the connection, "no" (0) disable LLMNR for the interface, "resolve" + * (1) do not register hostname but allow resolving of LLMNR host names + * If unspecified, "default" ultimately depends on the DNS plugin (which + * for systemd-resolved currently means "yes"). * - * This feature requires a plugin which supports LLMNR. One such - * plugin is dns-systemd-resolved. + * This feature requires a plugin which supports LLMNR. Otherwise the + * setting has no effect. One such plugin is dns-systemd-resolved. * * Since: 1.14 **/ diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index cdf55ed62e..c213d342b6 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -674,9 +674,11 @@ ipv6.ip6-privacy=0 connection.llmnr + If unspecified, the ultimate default values depends on the DNS plugin. With systemd-resolved the default currently is "yes" (2) and for all other plugins "no" (0). connection.mdns + If unspecified, the ultimate default values depends on the DNS plugin. With systemd-resolved the default currently is "no" (0) and for all other plugins also "no" (0). connection.stable-id From 622eef4882028fa49a1ffd836ffdb6c633863197 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Thu, 29 Aug 2019 10:55:26 +0200 Subject: [PATCH 069/109] cli: expose device D-Bus path https://bugzilla.redhat.com/show_bug.cgi?id=1745574 --- clients/cli/devices.c | 3 + clients/cli/utils.h | 1 + .../test_003.expected | 472 ++--- .../test_004.expected | 1584 ++++++++++------- 4 files changed, 1180 insertions(+), 880 deletions(-) diff --git a/clients/cli/devices.c b/clients/cli/devices.c index a3c3ba8dae..58a11a3f2d 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -157,6 +157,8 @@ _metagen_device_detail_general_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) return nm_device_get_type_description (d); case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_NM_TYPE: return G_OBJECT_TYPE_NAME (d); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DBUS_PATH: + return nm_object_get_path (NM_OBJECT (d)); case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_VENDOR: return nm_device_get_vendor (d); case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_PRODUCT: @@ -238,6 +240,7 @@ const NmcMetaGenericInfo *const metagen_device_detail_general[_NMC_GENERIC_INFO_ _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DEVICE, "DEVICE"), _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_TYPE, "TYPE"), _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_NM_TYPE, "NM-TYPE"), + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DBUS_PATH, "DBUS-PATH"), _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_VENDOR, "VENDOR"), _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_PRODUCT, "PRODUCT"), _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DRIVER, "DRIVER"), diff --git a/clients/cli/utils.h b/clients/cli/utils.h index 8466cf36e6..e699a641b6 100644 --- a/clients/cli/utils.h +++ b/clients/cli/utils.h @@ -164,6 +164,7 @@ typedef enum { NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DEVICE = 0, NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_TYPE, NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_NM_TYPE, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DBUS_PATH, NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_VENDOR, NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_PRODUCT, NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DRIVER, diff --git a/clients/tests/test-client.check-on-disk/test_003.expected b/clients/tests/test-client.check-on-disk/test_003.expected index fd0a86139b..a4e4302595 100644 --- a/clients/tests/test-client.check-on-disk/test_003.expected +++ b/clients/tests/test-client.check-on-disk/test_003.expected @@ -970,16 +970,17 @@ stderr: 54 bytes Błąd: nieprawidłowy dodatkowy parametr „eth0”. <<< -size: 3621 +size: 3703 location: clients/tests/test-client.py:test_003()/35 cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 -stdout: 3485 bytes +stdout: 3567 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -1039,16 +1040,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< -size: 3657 +size: 3739 location: clients/tests/test-client.py:test_003()/36 cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3511 bytes +stdout: 3593 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -1108,16 +1110,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< -size: 2314 +size: 2374 location: clients/tests/test-client.py:test_003()/37 cmd: $NMCLI -f ALL -t dev show eth0 lang: C returncode: 0 -stdout: 2175 bytes +stdout: 2235 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -1177,16 +1180,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< -size: 2324 +size: 2384 location: clients/tests/test-client.py:test_003()/38 cmd: $NMCLI -f ALL -t dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2175 bytes +stdout: 2235 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -1902,16 +1906,17 @@ stderr: 54 bytes Błąd: nieprawidłowy dodatkowy parametr „eth0”. <<< -size: 3621 +size: 3703 location: clients/tests/test-client.py:test_003()/60 cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 -stdout: 3485 bytes +stdout: 3567 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -1971,16 +1976,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< -size: 3657 +size: 3739 location: clients/tests/test-client.py:test_003()/61 cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3511 bytes +stdout: 3593 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -2040,16 +2046,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< -size: 2314 +size: 2374 location: clients/tests/test-client.py:test_003()/62 cmd: $NMCLI -f ALL -t dev show eth0 lang: C returncode: 0 -stdout: 2175 bytes +stdout: 2235 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -2109,16 +2116,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< -size: 2324 +size: 2384 location: clients/tests/test-client.py:test_003()/63 cmd: $NMCLI -f ALL -t dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2175 bytes +stdout: 2235 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -2704,16 +2712,17 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 3621 +size: 3703 location: clients/tests/test-client.py:test_003()/72 cmd: $NMCLI -f all dev show eth0 lang: C returncode: 0 -stdout: 3485 bytes +stdout: 3567 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -2773,16 +2782,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< -size: 3657 +size: 3739 location: clients/tests/test-client.py:test_003()/73 cmd: $NMCLI -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3511 bytes +stdout: 3593 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -3368,16 +3378,17 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 3633 +size: 3715 location: clients/tests/test-client.py:test_003()/82 cmd: $NMCLI --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 3485 bytes +stdout: 3567 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -3437,16 +3448,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< -size: 3669 +size: 3751 location: clients/tests/test-client.py:test_003()/83 cmd: $NMCLI --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3511 bytes +stdout: 3593 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -4104,12 +4116,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 4561 +size: 4643 location: clients/tests/test-client.py:test_003()/92 cmd: $NMCLI --pretty -f all dev show eth0 lang: C returncode: 0 -stdout: 4416 bytes +stdout: 4498 bytes >>> =============================================================================== Device details (eth0) @@ -4117,6 +4129,7 @@ stdout: 4416 bytes GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -4185,12 +4198,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | e ------------------------------------------------------------------------------- <<< -size: 4603 +size: 4685 location: clients/tests/test-client.py:test_003()/93 cmd: $NMCLI --pretty -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4448 bytes +stdout: 4530 bytes >>> =============================================================================== Informacje o urządzeniu (eth0) @@ -4198,6 +4211,7 @@ stdout: 4448 bytes GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -4864,12 +4878,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 4574 +size: 4656 location: clients/tests/test-client.py:test_003()/102 cmd: $NMCLI --pretty --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 4416 bytes +stdout: 4498 bytes >>> =============================================================================== Device details (eth0) @@ -4877,6 +4891,7 @@ stdout: 4416 bytes GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -4945,12 +4960,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | e ------------------------------------------------------------------------------- <<< -size: 4616 +size: 4698 location: clients/tests/test-client.py:test_003()/103 cmd: $NMCLI --pretty --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4448 bytes +stdout: 4530 bytes >>> =============================================================================== Informacje o urządzeniu (eth0) @@ -4958,6 +4973,7 @@ stdout: 4448 bytes GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -5548,16 +5564,17 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2320 +size: 2380 location: clients/tests/test-client.py:test_003()/112 cmd: $NMCLI --terse -f all dev show eth0 lang: C returncode: 0 -stdout: 2175 bytes +stdout: 2235 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -5617,16 +5634,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< -size: 2330 +size: 2390 location: clients/tests/test-client.py:test_003()/113 cmd: $NMCLI --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2175 bytes +stdout: 2235 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -6208,16 +6226,17 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2332 +size: 2392 location: clients/tests/test-client.py:test_003()/122 cmd: $NMCLI --terse --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 2175 bytes +stdout: 2235 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -6277,16 +6296,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< -size: 2342 +size: 2402 location: clients/tests/test-client.py:test_003()/123 cmd: $NMCLI --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2175 bytes +stdout: 2235 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -6520,15 +6540,15 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deza <<< -size: 3050 +size: 3136 location: clients/tests/test-client.py:test_003()/132 cmd: $NMCLI --mode tabular -f all dev show eth0 lang: C returncode: 0 -stdout: 2898 bytes +stdout: 2984 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL eth0 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/1 -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES no 100 Mb/s no no @@ -6555,15 +6575,15 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILA CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< -size: 3081 +size: 3167 location: clients/tests/test-client.py:test_003()/133 cmd: $NMCLI --mode tabular -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2919 bytes +stdout: 3005 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL eth0 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/1 -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES nie 100 Mb/s nie nie @@ -6764,15 +6784,15 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deza <<< -size: 3062 +size: 3148 location: clients/tests/test-client.py:test_003()/142 cmd: $NMCLI --mode tabular --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 2898 bytes +stdout: 2984 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL eth0 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/1 -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES no 100 Mb/s no no @@ -6799,15 +6819,15 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILA CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< -size: 3093 +size: 3179 location: clients/tests/test-client.py:test_003()/143 cmd: $NMCLI --mode tabular --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2919 bytes +stdout: 3005 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL eth0 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/1 -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES nie 100 Mb/s nie nie @@ -7080,19 +7100,19 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deza <<< -size: 4589 +size: 4718 location: clients/tests/test-client.py:test_003()/152 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0 lang: C returncode: 0 -stdout: 4428 bytes +stdout: 4557 bytes >>> ========================= Device details (eth0) ========================= -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL eth0 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/1 -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -7127,19 +7147,19 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILA CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< -size: 4657 +size: 4786 location: clients/tests/test-client.py:test_003()/153 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4486 bytes +stdout: 4615 bytes >>> ================================== Informacje o urządzeniu (eth0) ================================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL eth0 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/1 -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -7420,19 +7440,19 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deza <<< -size: 4601 +size: 4730 location: clients/tests/test-client.py:test_003()/162 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 4428 bytes +stdout: 4557 bytes >>> ========================= Device details (eth0) ========================= -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL eth0 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/1 -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -7467,19 +7487,19 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILA CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< -size: 4669 +size: 4798 location: clients/tests/test-client.py:test_003()/163 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4486 bytes +stdout: 4615 bytes >>> ================================== Informacje o urządzeniu (eth0) ================================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL eth0 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/1 -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -7632,14 +7652,14 @@ proxy:none:no:: GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4:: <<< -size: 1398 +size: 1440 location: clients/tests/test-client.py:test_003()/172 cmd: $NMCLI --mode tabular --terse -f all dev show eth0 lang: C returncode: 0 -stdout: 1238 bytes +stdout: 1280 bytes >>> -GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown +GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown CAPABILITIES:no:100 Mb/s:no:no INTERFACE-FLAGS:yes:yes:no WIRED-PROPERTIES:off: @@ -7650,14 +7670,14 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< -size: 1408 +size: 1450 location: clients/tests/test-client.py:test_003()/173 cmd: $NMCLI --mode tabular --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1238 bytes +stdout: 1280 bytes >>> -GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown +GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown CAPABILITIES:no:100 Mb/s:no:no INTERFACE-FLAGS:yes:yes:no WIRED-PROPERTIES:off: @@ -7786,14 +7806,14 @@ proxy:none:no:: GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4:: <<< -size: 1410 +size: 1452 location: clients/tests/test-client.py:test_003()/182 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 1238 bytes +stdout: 1280 bytes >>> -GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown +GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown CAPABILITIES:no:100 Mb/s:no:no INTERFACE-FLAGS:yes:yes:no WIRED-PROPERTIES:off: @@ -7804,14 +7824,14 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< -size: 1420 +size: 1462 location: clients/tests/test-client.py:test_003()/183 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1238 bytes +stdout: 1280 bytes >>> -GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown +GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown CAPABILITIES:no:100 Mb/s:no:no INTERFACE-FLAGS:yes:yes:no WIRED-PROPERTIES:off: @@ -8492,16 +8512,17 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 3639 +size: 3721 location: clients/tests/test-client.py:test_003()/192 cmd: $NMCLI --mode multiline -f all dev show eth0 lang: C returncode: 0 -stdout: 3485 bytes +stdout: 3567 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -8561,16 +8582,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< -size: 3675 +size: 3757 location: clients/tests/test-client.py:test_003()/193 cmd: $NMCLI --mode multiline -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3511 bytes +stdout: 3593 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -9300,16 +9322,17 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 3651 +size: 3733 location: clients/tests/test-client.py:test_003()/202 cmd: $NMCLI --mode multiline --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 3485 bytes +stdout: 3567 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -9369,16 +9392,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< -size: 3687 +size: 3769 location: clients/tests/test-client.py:test_003()/203 cmd: $NMCLI --mode multiline --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3511 bytes +stdout: 3593 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -10194,12 +10218,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 4579 +size: 4661 location: clients/tests/test-client.py:test_003()/212 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0 lang: C returncode: 0 -stdout: 4416 bytes +stdout: 4498 bytes >>> =============================================================================== Device details (eth0) @@ -10207,6 +10231,7 @@ stdout: 4416 bytes GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -10275,12 +10300,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | e ------------------------------------------------------------------------------- <<< -size: 4621 +size: 4703 location: clients/tests/test-client.py:test_003()/213 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4448 bytes +stdout: 4530 bytes >>> =============================================================================== Informacje o urządzeniu (eth0) @@ -10288,6 +10313,7 @@ stdout: 4448 bytes GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -11112,12 +11138,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 4591 +size: 4673 location: clients/tests/test-client.py:test_003()/222 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 4416 bytes +stdout: 4498 bytes >>> =============================================================================== Device details (eth0) @@ -11125,6 +11151,7 @@ stdout: 4416 bytes GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -11193,12 +11220,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | e ------------------------------------------------------------------------------- <<< -size: 4633 +size: 4715 location: clients/tests/test-client.py:test_003()/223 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4448 bytes +stdout: 4530 bytes >>> =============================================================================== Informacje o urządzeniu (eth0) @@ -11206,6 +11233,7 @@ stdout: 4448 bytes GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -11944,16 +11972,17 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2337 +size: 2397 location: clients/tests/test-client.py:test_003()/232 cmd: $NMCLI --mode multiline --terse -f all dev show eth0 lang: C returncode: 0 -stdout: 2175 bytes +stdout: 2235 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -12013,16 +12042,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< -size: 2347 +size: 2407 location: clients/tests/test-client.py:test_003()/233 cmd: $NMCLI --mode multiline --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2175 bytes +stdout: 2235 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -12752,16 +12782,17 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2349 +size: 2409 location: clients/tests/test-client.py:test_003()/242 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 2175 bytes +stdout: 2235 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -12821,16 +12852,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< -size: 2359 +size: 2419 location: clients/tests/test-client.py:test_003()/243 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2175 bytes +stdout: 2235 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -13010,16 +13042,17 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 3642 +size: 3724 location: clients/tests/test-client.py:test_003()/252 cmd: $NMCLI -f all dev show eth0 lang: C returncode: 0 -stdout: 3505 bytes +stdout: 3587 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -13079,16 +13112,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkManager/Settings/Connection/4 <<< -size: 3680 +size: 3762 location: clients/tests/test-client.py:test_003()/253 cmd: $NMCLI -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3533 bytes +stdout: 3615 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -13268,16 +13302,17 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 3654 +size: 3736 location: clients/tests/test-client.py:test_003()/262 cmd: $NMCLI --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 3505 bytes +stdout: 3587 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -13337,16 +13372,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkManager/Settings/Connection/4 <<< -size: 3692 +size: 3774 location: clients/tests/test-client.py:test_003()/263 cmd: $NMCLI --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3533 bytes +stdout: 3615 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -13556,12 +13592,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 4582 +size: 4664 location: clients/tests/test-client.py:test_003()/272 cmd: $NMCLI --pretty -f all dev show eth0 lang: C returncode: 0 -stdout: 4436 bytes +stdout: 4518 bytes >>> =============================================================================== Device details (eth0) @@ -13569,6 +13605,7 @@ stdout: 4436 bytes GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -13637,12 +13674,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkMa ------------------------------------------------------------------------------- <<< -size: 4626 +size: 4708 location: clients/tests/test-client.py:test_003()/273 cmd: $NMCLI --pretty -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4470 bytes +stdout: 4552 bytes >>> =============================================================================== Informacje o urządzeniu (eth0) @@ -13650,6 +13687,7 @@ stdout: 4470 bytes GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -13868,12 +13906,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 4594 +size: 4676 location: clients/tests/test-client.py:test_003()/282 cmd: $NMCLI --pretty --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 4436 bytes +stdout: 4518 bytes >>> =============================================================================== Device details (eth0) @@ -13881,6 +13919,7 @@ stdout: 4436 bytes GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -13949,12 +13988,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkMa ------------------------------------------------------------------------------- <<< -size: 4638 +size: 4720 location: clients/tests/test-client.py:test_003()/283 cmd: $NMCLI --pretty --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4470 bytes +stdout: 4552 bytes >>> =============================================================================== Informacje o urządzeniu (eth0) @@ -13962,6 +14001,7 @@ stdout: 4470 bytes GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -14146,16 +14186,17 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2340 +size: 2400 location: clients/tests/test-client.py:test_003()/292 cmd: $NMCLI --terse -f all dev show eth0 lang: C returncode: 0 -stdout: 2195 bytes +stdout: 2255 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -14215,16 +14256,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkManager/Settings/Connection/4 <<< -size: 2350 +size: 2410 location: clients/tests/test-client.py:test_003()/293 cmd: $NMCLI --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2195 bytes +stdout: 2255 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -14400,16 +14442,17 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2352 +size: 2412 location: clients/tests/test-client.py:test_003()/302 cmd: $NMCLI --terse --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 2195 bytes +stdout: 2255 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -14469,16 +14512,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkManager/Settings/Connection/4 <<< -size: 2362 +size: 2422 location: clients/tests/test-client.py:test_003()/303 cmd: $NMCLI --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2195 bytes +stdout: 2255 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -14638,15 +14682,15 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deza <<< -size: 3090 +size: 3176 location: clients/tests/test-client.py:test_003()/312 cmd: $NMCLI --mode tabular -f all dev show eth0 lang: C returncode: 0 -stdout: 2938 bytes +stdout: 3024 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL eth0 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/1 -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES no 100 Mb/s no no @@ -14673,15 +14717,15 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILA CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | | /org/freedesktop/NetworkManager/Settings/Connection/4 <<< -size: 3125 +size: 3211 location: clients/tests/test-client.py:test_003()/313 cmd: $NMCLI --mode tabular -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2963 bytes +stdout: 3049 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL eth0 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/1 -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES nie 100 Mb/s nie nie @@ -14808,15 +14852,15 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deza <<< -size: 3102 +size: 3188 location: clients/tests/test-client.py:test_003()/322 cmd: $NMCLI --mode tabular --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 2938 bytes +stdout: 3024 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL eth0 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/1 -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES no 100 Mb/s no no @@ -14843,15 +14887,15 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILA CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | | /org/freedesktop/NetworkManager/Settings/Connection/4 <<< -size: 3137 +size: 3223 location: clients/tests/test-client.py:test_003()/323 cmd: $NMCLI --mode tabular --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2963 bytes +stdout: 3049 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL eth0 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/1 -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES nie 100 Mb/s nie nie @@ -15008,19 +15052,19 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deza <<< -size: 4649 +size: 4778 location: clients/tests/test-client.py:test_003()/332 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0 lang: C returncode: 0 -stdout: 4488 bytes +stdout: 4617 bytes >>> ========================= Device details (eth0) ========================= -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL eth0 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/1 -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -15055,19 +15099,19 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILA CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | | /org/freedesktop/NetworkManager/Settings/Connection/4 <<< -size: 4723 +size: 4852 location: clients/tests/test-client.py:test_003()/333 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4552 bytes +stdout: 4681 bytes >>> ================================== Informacje o urządzeniu (eth0) ================================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL eth0 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/1 -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -15232,19 +15276,19 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deza <<< -size: 4661 +size: 4790 location: clients/tests/test-client.py:test_003()/342 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 4488 bytes +stdout: 4617 bytes >>> ========================= Device details (eth0) ========================= -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL eth0 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/1 -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -15279,19 +15323,19 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILA CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | | /org/freedesktop/NetworkManager/Settings/Connection/4 <<< -size: 4735 +size: 4864 location: clients/tests/test-client.py:test_003()/343 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4552 bytes +stdout: 4681 bytes >>> ================================== Informacje o urządzeniu (eth0) ================================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL eth0 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/1 -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -15418,14 +15462,14 @@ stdout: 190 bytes GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4:: <<< -size: 1418 +size: 1460 location: clients/tests/test-client.py:test_003()/352 cmd: $NMCLI --mode tabular --terse -f all dev show eth0 lang: C returncode: 0 -stdout: 1258 bytes +stdout: 1300 bytes >>> -GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown +GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown CAPABILITIES:no:100 Mb/s:no:no INTERFACE-FLAGS:yes:yes:no WIRED-PROPERTIES:off: @@ -15436,14 +15480,14 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | | /org/freedesktop/NetworkManager/Settings/Connection/4 <<< -size: 1428 +size: 1470 location: clients/tests/test-client.py:test_003()/353 cmd: $NMCLI --mode tabular --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1258 bytes +stdout: 1300 bytes >>> -GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown +GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown CAPABILITIES:no:100 Mb/s:no:no INTERFACE-FLAGS:yes:yes:no WIRED-PROPERTIES:off: @@ -15546,14 +15590,14 @@ stdout: 190 bytes GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4:: <<< -size: 1430 +size: 1472 location: clients/tests/test-client.py:test_003()/362 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 1258 bytes +stdout: 1300 bytes >>> -GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown +GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown CAPABILITIES:no:100 Mb/s:no:no INTERFACE-FLAGS:yes:yes:no WIRED-PROPERTIES:off: @@ -15564,14 +15608,14 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | | /org/freedesktop/NetworkManager/Settings/Connection/4 <<< -size: 1440 +size: 1482 location: clients/tests/test-client.py:test_003()/363 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1258 bytes +stdout: 1300 bytes >>> -GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown +GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown CAPABILITIES:no:100 Mb/s:no:no INTERFACE-FLAGS:yes:yes:no WIRED-PROPERTIES:off: @@ -15844,16 +15888,17 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 3659 +size: 3741 location: clients/tests/test-client.py:test_003()/372 cmd: $NMCLI --mode multiline -f all dev show eth0 lang: C returncode: 0 -stdout: 3505 bytes +stdout: 3587 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -15913,16 +15958,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkManager/Settings/Connection/4 <<< -size: 3697 +size: 3779 location: clients/tests/test-client.py:test_003()/373 cmd: $NMCLI --mode multiline -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3533 bytes +stdout: 3615 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -16244,16 +16290,17 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 3671 +size: 3753 location: clients/tests/test-client.py:test_003()/382 cmd: $NMCLI --mode multiline --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 3505 bytes +stdout: 3587 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -16313,16 +16360,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkManager/Settings/Connection/4 <<< -size: 3709 +size: 3791 location: clients/tests/test-client.py:test_003()/383 cmd: $NMCLI --mode multiline --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3533 bytes +stdout: 3615 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -16686,12 +16734,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 4599 +size: 4681 location: clients/tests/test-client.py:test_003()/392 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0 lang: C returncode: 0 -stdout: 4436 bytes +stdout: 4518 bytes >>> =============================================================================== Device details (eth0) @@ -16699,6 +16747,7 @@ stdout: 4436 bytes GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -16767,12 +16816,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkMa ------------------------------------------------------------------------------- <<< -size: 4643 +size: 4725 location: clients/tests/test-client.py:test_003()/393 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4470 bytes +stdout: 4552 bytes >>> =============================================================================== Informacje o urządzeniu (eth0) @@ -16780,6 +16829,7 @@ stdout: 4470 bytes GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -17152,12 +17202,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 4611 +size: 4693 location: clients/tests/test-client.py:test_003()/402 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 4436 bytes +stdout: 4518 bytes >>> =============================================================================== Device details (eth0) @@ -17165,6 +17215,7 @@ stdout: 4436 bytes GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -17233,12 +17284,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkMa ------------------------------------------------------------------------------- <<< -size: 4655 +size: 4737 location: clients/tests/test-client.py:test_003()/403 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4470 bytes +stdout: 4552 bytes >>> =============================================================================== Informacje o urządzeniu (eth0) @@ -17246,6 +17297,7 @@ stdout: 4470 bytes GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -17576,16 +17628,17 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2357 +size: 2417 location: clients/tests/test-client.py:test_003()/412 cmd: $NMCLI --mode multiline --terse -f all dev show eth0 lang: C returncode: 0 -stdout: 2195 bytes +stdout: 2255 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -17645,16 +17698,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkManager/Settings/Connection/4 <<< -size: 2367 +size: 2427 location: clients/tests/test-client.py:test_003()/413 cmd: $NMCLI --mode multiline --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2195 bytes +stdout: 2255 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -17976,16 +18030,17 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2369 +size: 2429 location: clients/tests/test-client.py:test_003()/422 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 2195 bytes +stdout: 2255 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -18045,16 +18100,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkManager/Settings/Connection/4 <<< -size: 2379 +size: 2439 location: clients/tests/test-client.py:test_003()/423 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2195 bytes +stdout: 2255 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual diff --git a/clients/tests/test-client.check-on-disk/test_004.expected b/clients/tests/test-client.check-on-disk/test_004.expected index 1ab9797d3e..460931bb5f 100644 --- a/clients/tests/test-client.check-on-disk/test_004.expected +++ b/clients/tests/test-client.check-on-disk/test_004.expected @@ -1808,16 +1808,17 @@ IP6.DNS[1]: 2001:a::2934:bd66:550d:ec19 IP6.DOMAIN[1]: sear6.fo.x.y <<< -size: 21800 +size: 22210 location: clients/tests/test-client.py:test_004()/39 cmd: $NMCLI -f all dev show lang: C returncode: 0 -stdout: 21668 bytes +stdout: 22078 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -1918,6 +1919,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -1984,6 +1986,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: eth1 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/2 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -2057,6 +2060,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/4 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -2151,6 +2155,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/5 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -2222,16 +2227,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 21961 +size: 22371 location: clients/tests/test-client.py:test_004()/40 cmd: $NMCLI -f all dev show lang: pl_PL.UTF-8 returncode: 0 -stdout: 21819 bytes +stdout: 22229 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -2332,6 +2338,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -2398,6 +2405,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: eth1 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/2 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -2471,6 +2479,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/4 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -2565,6 +2574,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/5 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -2702,16 +2712,17 @@ IP6.DOMAIN[5]: sear6.foo3.bar IP6.DOMAIN[6]: sear6.foo4.bar <<< -size: 5233 +size: 5315 location: clients/tests/test-client.py:test_004()/43 cmd: $NMCLI -f all dev show wlan0 lang: C returncode: 0 -stdout: 5096 bytes +stdout: 5178 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -2810,16 +2821,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 5291 +size: 5373 location: clients/tests/test-client.py:test_004()/44 cmd: $NMCLI -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5144 bytes +stdout: 5226 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -2918,16 +2930,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 2041 +size: 2123 location: clients/tests/test-client.py:test_004()/45 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 1869 bytes +stdout: 1951 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -2965,16 +2978,17 @@ WIFI-PROPERTIES.MESH: no WIFI-PROPERTIES.IBSS-RSN: no <<< -size: 2067 +size: 2149 location: clients/tests/test-client.py:test_004()/46 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1885 bytes +stdout: 1967 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -3012,16 +3026,17 @@ WIFI-PROPERTIES.MESH: nie WIFI-PROPERTIES.IBSS-RSN: nie <<< -size: 2041 +size: 2123 location: clients/tests/test-client.py:test_004()/47 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 1869 bytes +stdout: 1951 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -3059,16 +3074,17 @@ WIFI-PROPERTIES.MESH: no WIFI-PROPERTIES.IBSS-RSN: no <<< -size: 2067 +size: 2149 location: clients/tests/test-client.py:test_004()/48 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1885 bytes +stdout: 1967 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -3322,16 +3338,17 @@ AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 <<< -size: 5236 +size: 5318 location: clients/tests/test-client.py:test_004()/63 cmd: $NMCLI -f ALL device show wlan0 lang: C returncode: 0 -stdout: 5096 bytes +stdout: 5178 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -3430,16 +3447,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 5294 +size: 5376 location: clients/tests/test-client.py:test_004()/64 cmd: $NMCLI -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5144 bytes +stdout: 5226 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -3604,16 +3622,17 @@ IP6.DOMAIN[5]: sear6.foo3.bar IP6.DOMAIN[6]: sear6.foo4.bar <<< -size: 5243 +size: 5325 location: clients/tests/test-client.py:test_004()/67 cmd: $NMCLI -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 4965 bytes +stdout: 5047 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -3709,16 +3728,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 5300 +size: 5382 location: clients/tests/test-client.py:test_004()/68 cmd: $NMCLI -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5012 bytes +stdout: 5094 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -4918,16 +4938,17 @@ IP6.DNS[1]: 2001:a::2934:bd66:550d:ec19 IP6.DOMAIN[1]: sear6.fo.x.y <<< -size: 22136 +size: 22546 location: clients/tests/test-client.py:test_004()/87 cmd: $NMCLI --color yes -f all dev show lang: C returncode: 0 -stdout: 21992 bytes +stdout: 22402 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -5028,6 +5049,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -5094,6 +5116,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: eth1 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/2 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -5167,6 +5190,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/4 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -5261,6 +5285,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/5 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -5332,16 +5357,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 22297 +size: 22707 location: clients/tests/test-client.py:test_004()/88 cmd: $NMCLI --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 -stdout: 22143 bytes +stdout: 22553 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -5442,6 +5468,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -5508,6 +5535,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: eth1 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/2 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -5581,6 +5609,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/4 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -5675,6 +5704,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/5 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -5812,16 +5842,17 @@ IP6.DOMAIN[5]: sear6.foo3.bar IP6.DOMAIN[6]: sear6.foo4.bar <<< -size: 5488 +size: 5570 location: clients/tests/test-client.py:test_004()/91 cmd: $NMCLI --color yes -f all dev show wlan0 lang: C returncode: 0 -stdout: 5339 bytes +stdout: 5421 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -5920,16 +5951,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 5546 +size: 5628 location: clients/tests/test-client.py:test_004()/92 cmd: $NMCLI --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5387 bytes +stdout: 5469 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -6028,16 +6060,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 2053 +size: 2135 location: clients/tests/test-client.py:test_004()/93 cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 1869 bytes +stdout: 1951 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -6075,16 +6108,17 @@ WIFI-PROPERTIES.MESH: no WIFI-PROPERTIES.IBSS-RSN: no <<< -size: 2079 +size: 2161 location: clients/tests/test-client.py:test_004()/94 cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1885 bytes +stdout: 1967 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -6122,16 +6156,17 @@ WIFI-PROPERTIES.MESH: nie WIFI-PROPERTIES.IBSS-RSN: nie <<< -size: 2053 +size: 2135 location: clients/tests/test-client.py:test_004()/95 cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 1869 bytes +stdout: 1951 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -6169,16 +6204,17 @@ WIFI-PROPERTIES.MESH: no WIFI-PROPERTIES.IBSS-RSN: no <<< -size: 2079 +size: 2161 location: clients/tests/test-client.py:test_004()/96 cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1885 bytes +stdout: 1967 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -6432,16 +6468,17 @@ NAME SSID SSID-HEX BSSID MODE CHAN <<< -size: 5492 +size: 5574 location: clients/tests/test-client.py:test_004()/111 cmd: $NMCLI --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 5339 bytes +stdout: 5421 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -6540,16 +6577,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 5550 +size: 5632 location: clients/tests/test-client.py:test_004()/112 cmd: $NMCLI --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5387 bytes +stdout: 5469 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -6714,16 +6752,17 @@ IP6.DOMAIN[5]: sear6.foo3.bar IP6.DOMAIN[6]: sear6.foo4.bar <<< -size: 5499 +size: 5581 location: clients/tests/test-client.py:test_004()/115 cmd: $NMCLI --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 5208 bytes +stdout: 5290 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -6819,16 +6858,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 5556 +size: 5638 location: clients/tests/test-client.py:test_004()/116 cmd: $NMCLI --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5255 bytes +stdout: 5337 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -8252,12 +8292,12 @@ IP6.DOMAIN[1]: sear6.fo.x.y ------------------------------------------------------------------------------- <<< -size: 26785 +size: 27195 location: clients/tests/test-client.py:test_004()/135 cmd: $NMCLI --pretty -f all dev show lang: C returncode: 0 -stdout: 26643 bytes +stdout: 27053 bytes >>> =============================================================================== Device details (wlan0) @@ -8265,6 +8305,7 @@ stdout: 26643 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -8380,6 +8421,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -8458,6 +8500,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: eth1 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/2 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -8543,6 +8586,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/4 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -8650,6 +8694,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/5 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -8730,12 +8775,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -size: 26979 +size: 27389 location: clients/tests/test-client.py:test_004()/136 cmd: $NMCLI --pretty -f all dev show lang: pl_PL.UTF-8 returncode: 0 -stdout: 26827 bytes +stdout: 27237 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -8743,6 +8788,7 @@ stdout: 26827 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -8858,6 +8904,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -8936,6 +8983,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: eth1 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/2 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -9021,6 +9069,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/4 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -9128,6 +9177,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/5 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -9298,12 +9348,12 @@ IP6.DOMAIN[6]: sear6.foo4.bar ------------------------------------------------------------------------------- <<< -size: 6414 +size: 6496 location: clients/tests/test-client.py:test_004()/139 cmd: $NMCLI --pretty -f all dev show wlan0 lang: C returncode: 0 -stdout: 6267 bytes +stdout: 6349 bytes >>> =============================================================================== Device details (wlan0) @@ -9311,6 +9361,7 @@ stdout: 6267 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -9421,12 +9472,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -size: 6479 +size: 6561 location: clients/tests/test-client.py:test_004()/140 cmd: $NMCLI --pretty -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 6322 bytes +stdout: 6404 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -9434,6 +9485,7 @@ stdout: 6322 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -9544,12 +9596,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -size: 2502 +size: 2584 location: clients/tests/test-client.py:test_004()/141 cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 2320 bytes +stdout: 2402 bytes >>> =============================================================================== Device details (wlan0) @@ -9557,6 +9609,7 @@ stdout: 2320 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -9597,12 +9650,12 @@ WIFI-PROPERTIES.IBSS-RSN: no ------------------------------------------------------------------------------- <<< -size: 2535 +size: 2617 location: clients/tests/test-client.py:test_004()/142 cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2343 bytes +stdout: 2425 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -9610,6 +9663,7 @@ stdout: 2343 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -9650,12 +9704,12 @@ WIFI-PROPERTIES.IBSS-RSN: nie ------------------------------------------------------------------------------- <<< -size: 2502 +size: 2584 location: clients/tests/test-client.py:test_004()/143 cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 2320 bytes +stdout: 2402 bytes >>> =============================================================================== Device details (wlan0) @@ -9663,6 +9717,7 @@ stdout: 2320 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -9703,12 +9758,12 @@ WIFI-PROPERTIES.IBSS-RSN: no ------------------------------------------------------------------------------- <<< -size: 2535 +size: 2617 location: clients/tests/test-client.py:test_004()/144 cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2343 bytes +stdout: 2425 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -9716,6 +9771,7 @@ stdout: 2343 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -10076,12 +10132,12 @@ AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 <<< -size: 6417 +size: 6499 location: clients/tests/test-client.py:test_004()/159 cmd: $NMCLI --pretty -f ALL device show wlan0 lang: C returncode: 0 -stdout: 6267 bytes +stdout: 6349 bytes >>> =============================================================================== Device details (wlan0) @@ -10089,6 +10145,7 @@ stdout: 6267 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -10199,12 +10256,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -size: 6482 +size: 6564 location: clients/tests/test-client.py:test_004()/160 cmd: $NMCLI --pretty -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 6322 bytes +stdout: 6404 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -10212,6 +10269,7 @@ stdout: 6322 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -10412,12 +10470,12 @@ IP6.DOMAIN[6]: sear6.foo4.bar ------------------------------------------------------------------------------- <<< -size: 6344 +size: 6426 location: clients/tests/test-client.py:test_004()/163 cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 6056 bytes +stdout: 6138 bytes >>> =============================================================================== Device details (wlan0) @@ -10425,6 +10483,7 @@ stdout: 6056 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -10531,12 +10590,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -size: 6408 +size: 6490 location: clients/tests/test-client.py:test_004()/164 cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 6110 bytes +stdout: 6192 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -10544,6 +10603,7 @@ stdout: 6110 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -11990,12 +12050,12 @@ IP6.DOMAIN[1]: sear6.fo.x.y ------------------------------------------------------------------------------- <<< -size: 27121 +size: 27531 location: clients/tests/test-client.py:test_004()/183 cmd: $NMCLI --pretty --color yes -f all dev show lang: C returncode: 0 -stdout: 26967 bytes +stdout: 27377 bytes >>> =============================================================================== Device details (wlan0) @@ -12003,6 +12063,7 @@ stdout: 26967 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -12118,6 +12179,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -12196,6 +12258,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: eth1 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/2 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -12281,6 +12344,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/4 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -12388,6 +12452,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/5 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -12468,12 +12533,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -size: 27315 +size: 27725 location: clients/tests/test-client.py:test_004()/184 cmd: $NMCLI --pretty --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 -stdout: 27151 bytes +stdout: 27561 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -12481,6 +12546,7 @@ stdout: 27151 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -12596,6 +12662,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -12674,6 +12741,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: eth1 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/2 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -12759,6 +12827,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/4 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -12866,6 +12935,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/5 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -13036,12 +13106,12 @@ IP6.DOMAIN[6]: sear6.foo4.bar ------------------------------------------------------------------------------- <<< -size: 6669 +size: 6751 location: clients/tests/test-client.py:test_004()/187 cmd: $NMCLI --pretty --color yes -f all dev show wlan0 lang: C returncode: 0 -stdout: 6510 bytes +stdout: 6592 bytes >>> =============================================================================== Device details (wlan0) @@ -13049,6 +13119,7 @@ stdout: 6510 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -13159,12 +13230,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -size: 6734 +size: 6816 location: clients/tests/test-client.py:test_004()/188 cmd: $NMCLI --pretty --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 6565 bytes +stdout: 6647 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -13172,6 +13243,7 @@ stdout: 6565 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -13282,12 +13354,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -size: 2514 +size: 2596 location: clients/tests/test-client.py:test_004()/189 cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 2320 bytes +stdout: 2402 bytes >>> =============================================================================== Device details (wlan0) @@ -13295,6 +13367,7 @@ stdout: 2320 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -13335,12 +13408,12 @@ WIFI-PROPERTIES.IBSS-RSN: no ------------------------------------------------------------------------------- <<< -size: 2547 +size: 2629 location: clients/tests/test-client.py:test_004()/190 cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2343 bytes +stdout: 2425 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -13348,6 +13421,7 @@ stdout: 2343 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -13388,12 +13462,12 @@ WIFI-PROPERTIES.IBSS-RSN: nie ------------------------------------------------------------------------------- <<< -size: 2514 +size: 2596 location: clients/tests/test-client.py:test_004()/191 cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 2320 bytes +stdout: 2402 bytes >>> =============================================================================== Device details (wlan0) @@ -13401,6 +13475,7 @@ stdout: 2320 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -13441,12 +13516,12 @@ WIFI-PROPERTIES.IBSS-RSN: no ------------------------------------------------------------------------------- <<< -size: 2547 +size: 2629 location: clients/tests/test-client.py:test_004()/192 cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2343 bytes +stdout: 2425 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -13454,6 +13529,7 @@ stdout: 2343 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -13814,12 +13890,12 @@ NAME SSID SSID-HEX BSSID MODE CHAN <<< -size: 6672 +size: 6754 location: clients/tests/test-client.py:test_004()/207 cmd: $NMCLI --pretty --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 6510 bytes +stdout: 6592 bytes >>> =============================================================================== Device details (wlan0) @@ -13827,6 +13903,7 @@ stdout: 6510 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -13937,12 +14014,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -size: 6737 +size: 6819 location: clients/tests/test-client.py:test_004()/208 cmd: $NMCLI --pretty --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 6565 bytes +stdout: 6647 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -13950,6 +14027,7 @@ stdout: 6565 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -14150,12 +14228,12 @@ IP6.DOMAIN[6]: sear6.foo4.bar ------------------------------------------------------------------------------- <<< -size: 6599 +size: 6681 location: clients/tests/test-client.py:test_004()/211 cmd: $NMCLI --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 6299 bytes +stdout: 6381 bytes >>> =============================================================================== Device details (wlan0) @@ -14163,6 +14241,7 @@ stdout: 6299 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -14269,12 +14348,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -size: 6663 +size: 6745 location: clients/tests/test-client.py:test_004()/212 cmd: $NMCLI --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 6353 bytes +stdout: 6435 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -14282,6 +14361,7 @@ stdout: 6353 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -15500,16 +15580,17 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19 IP6.DOMAIN[1]:sear6.fo.x.y <<< -size: 12593 +size: 12893 location: clients/tests/test-client.py:test_004()/231 cmd: $NMCLI --terse -f all dev show lang: C returncode: 0 -stdout: 12452 bytes +stdout: 12752 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -15610,6 +15691,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -15676,6 +15758,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con- GENERAL.DEVICE:eth1 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -15749,6 +15832,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con- GENERAL.DEVICE:wlan1 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -15843,6 +15927,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- GENERAL.DEVICE:wlan1 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -15914,16 +15999,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 12639 +size: 12939 location: clients/tests/test-client.py:test_004()/232 cmd: $NMCLI --terse -f all dev show lang: pl_PL.UTF-8 returncode: 0 -stdout: 12488 bytes +stdout: 12788 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -16024,6 +16110,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -16090,6 +16177,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con- GENERAL.DEVICE:eth1 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -16163,6 +16251,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con- GENERAL.DEVICE:wlan1 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -16257,6 +16346,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- GENERAL.DEVICE:wlan1 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -16394,16 +16484,17 @@ IP6.DOMAIN[5]:sear6.foo3.bar IP6.DOMAIN[6]:sear6.foo4.bar <<< -size: 2909 +size: 2969 location: clients/tests/test-client.py:test_004()/235 cmd: $NMCLI --terse -f all dev show wlan0 lang: C returncode: 0 -stdout: 2763 bytes +stdout: 2823 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -16502,16 +16593,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 2946 +size: 3006 location: clients/tests/test-client.py:test_004()/236 cmd: $NMCLI --terse -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2790 bytes +stdout: 2850 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -16610,16 +16702,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 1238 +size: 1298 location: clients/tests/test-client.py:test_004()/237 cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 1057 bytes +stdout: 1117 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -16657,16 +16750,17 @@ WIFI-PROPERTIES.MESH:no WIFI-PROPERTIES.IBSS-RSN:no <<< -size: 1248 +size: 1308 location: clients/tests/test-client.py:test_004()/238 cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1057 bytes +stdout: 1117 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -16704,16 +16798,17 @@ WIFI-PROPERTIES.MESH:no WIFI-PROPERTIES.IBSS-RSN:no <<< -size: 1238 +size: 1298 location: clients/tests/test-client.py:test_004()/239 cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 1057 bytes +stdout: 1117 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -16751,16 +16846,17 @@ WIFI-PROPERTIES.MESH:no WIFI-PROPERTIES.IBSS-RSN:no <<< -size: 1248 +size: 1308 location: clients/tests/test-client.py:test_004()/240 cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1057 bytes +stdout: 1117 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -16988,16 +17084,17 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:24 <<< -size: 2912 +size: 2972 location: clients/tests/test-client.py:test_004()/255 cmd: $NMCLI --terse -f ALL device show wlan0 lang: C returncode: 0 -stdout: 2763 bytes +stdout: 2823 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -17096,16 +17193,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 2949 +size: 3009 location: clients/tests/test-client.py:test_004()/256 cmd: $NMCLI --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2790 bytes +stdout: 2850 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -17270,16 +17368,17 @@ IP6.DOMAIN[5]:sear6.foo3.bar IP6.DOMAIN[6]:sear6.foo4.bar <<< -size: 2971 +size: 3031 location: clients/tests/test-client.py:test_004()/259 cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 2684 bytes +stdout: 2744 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -17375,16 +17474,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 3008 +size: 3068 location: clients/tests/test-client.py:test_004()/260 cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2711 bytes +stdout: 2771 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -18580,16 +18680,17 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19 IP6.DOMAIN[1]:sear6.fo.x.y <<< -size: 12929 +size: 13229 location: clients/tests/test-client.py:test_004()/279 cmd: $NMCLI --terse --color yes -f all dev show lang: C returncode: 0 -stdout: 12776 bytes +stdout: 13076 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -18690,6 +18791,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -18756,6 +18858,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con- GENERAL.DEVICE:eth1 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -18829,6 +18932,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con- GENERAL.DEVICE:wlan1 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -18923,6 +19027,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- GENERAL.DEVICE:wlan1 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -18994,16 +19099,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 12975 +size: 13275 location: clients/tests/test-client.py:test_004()/280 cmd: $NMCLI --terse --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 -stdout: 12812 bytes +stdout: 13112 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -19104,6 +19210,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -19170,6 +19277,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con- GENERAL.DEVICE:eth1 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -19243,6 +19351,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con- GENERAL.DEVICE:wlan1 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -19337,6 +19446,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- GENERAL.DEVICE:wlan1 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -19474,16 +19584,17 @@ IP6.DOMAIN[5]:sear6.foo3.bar IP6.DOMAIN[6]:sear6.foo4.bar <<< -size: 3164 +size: 3224 location: clients/tests/test-client.py:test_004()/283 cmd: $NMCLI --terse --color yes -f all dev show wlan0 lang: C returncode: 0 -stdout: 3006 bytes +stdout: 3066 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -19582,16 +19693,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 3201 +size: 3261 location: clients/tests/test-client.py:test_004()/284 cmd: $NMCLI --terse --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3033 bytes +stdout: 3093 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -19690,16 +19802,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 1250 +size: 1310 location: clients/tests/test-client.py:test_004()/285 cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 1057 bytes +stdout: 1117 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -19737,16 +19850,17 @@ WIFI-PROPERTIES.MESH:no WIFI-PROPERTIES.IBSS-RSN:no <<< -size: 1260 +size: 1320 location: clients/tests/test-client.py:test_004()/286 cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1057 bytes +stdout: 1117 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -19784,16 +19898,17 @@ WIFI-PROPERTIES.MESH:no WIFI-PROPERTIES.IBSS-RSN:no <<< -size: 1250 +size: 1310 location: clients/tests/test-client.py:test_004()/287 cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 1057 bytes +stdout: 1117 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -19831,16 +19946,17 @@ WIFI-PROPERTIES.MESH:no WIFI-PROPERTIES.IBSS-RSN:no <<< -size: 1260 +size: 1320 location: clients/tests/test-client.py:test_004()/288 cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1057 bytes +stdout: 1117 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -20068,16 +20184,17 @@ stdout: 422 bytes <<< -size: 3167 +size: 3227 location: clients/tests/test-client.py:test_004()/303 cmd: $NMCLI --terse --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 3006 bytes +stdout: 3066 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -20176,16 +20293,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 3204 +size: 3264 location: clients/tests/test-client.py:test_004()/304 cmd: $NMCLI --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3033 bytes +stdout: 3093 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -20350,16 +20468,17 @@ IP6.DOMAIN[5]:sear6.foo3.bar IP6.DOMAIN[6]:sear6.foo4.bar <<< -size: 3226 +size: 3286 location: clients/tests/test-client.py:test_004()/307 cmd: $NMCLI --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 2927 bytes +stdout: 2987 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -20455,16 +20574,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 3263 +size: 3323 location: clients/tests/test-client.py:test_004()/308 cmd: $NMCLI --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2954 bytes +stdout: 3014 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -21186,15 +21306,15 @@ GROUP ADDRESS GATEWAY ROUTE IP6 2001:a::88ca:3654:96b:ab44/89 -- dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = :: 2001:a::2934:bd66:550d:ec19 sear6.fo.x.y <<< -size: 15488 +size: 15918 location: clients/tests/test-client.py:test_004()/327 cmd: $NMCLI --mode tabular -f all dev show lang: C returncode: 0 -stdout: 15340 bytes +stdout: 15770 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES no unknown no no @@ -21225,8 +21345,8 @@ DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- AB:B7:BF:E2:48:E8 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth0 -- no yes yes no no -- -- -- -- unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL eth0 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/1 -- -- virtual -- -- AB:B7:BF:E2:48:E8 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth0 -- no yes yes no no -- -- -- -- unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES no 100 Mb/s no no @@ -21252,8 +21372,8 @@ DHCP6 dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL eth1 ethernet NMDeviceEthernet -- -- virtual -- -- E7:78:B1:93:2B:22 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth1 -- no yes yes no no -- -- -- -- unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL eth1 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/2 -- -- virtual -- -- E7:78:B1:93:2B:22 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth1 -- no yes yes no no -- -- -- -- unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES no 100 Mb/s no no @@ -21279,8 +21399,8 @@ DHCP6 dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan1 wifi NMDeviceWifi -- -- virtual -- -- 21:E9:64:81:8C:A8 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan1 -- no yes yes no no -- -- -- -- unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan1 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/4 -- -- virtual -- -- 21:E9:64:81:8C:A8 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan1 -- no yes yes no no -- -- -- -- unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES no unknown no no @@ -21309,8 +21429,8 @@ DHCP6 dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan1 wifi NMDeviceWifi -- -- virtual -- -- 71:52:AD:63:5C:7C 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan1 -- no yes yes no no -- -- -- -- unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan1 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/5 -- -- virtual -- -- 71:52:AD:63:5C:7C 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan1 -- no yes yes no no -- -- -- -- unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES no unknown no no @@ -21339,15 +21459,15 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 15647 +size: 16077 location: clients/tests/test-client.py:test_004()/328 cmd: $NMCLI --mode tabular -f all dev show lang: pl_PL.UTF-8 returncode: 0 -stdout: 15489 bytes +stdout: 15919 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES nie nieznane nie nie @@ -21378,8 +21498,8 @@ DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- AB:B7:BF:E2:48:E8 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- -- -- -- nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL eth0 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/1 -- -- virtual -- -- AB:B7:BF:E2:48:E8 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- -- -- -- nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES nie 100 Mb/s nie nie @@ -21405,8 +21525,8 @@ DHCP6 dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL eth1 ethernet NMDeviceEthernet -- -- virtual -- -- E7:78:B1:93:2B:22 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth1 -- nie tak tak nie nie -- -- -- -- nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL eth1 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/2 -- -- virtual -- -- E7:78:B1:93:2B:22 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth1 -- nie tak tak nie nie -- -- -- -- nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES nie 100 Mb/s nie nie @@ -21432,8 +21552,8 @@ DHCP6 dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan1 wifi NMDeviceWifi -- -- virtual -- -- 21:E9:64:81:8C:A8 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan1 -- nie tak tak nie nie -- -- -- -- nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan1 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/4 -- -- virtual -- -- 21:E9:64:81:8C:A8 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan1 -- nie tak tak nie nie -- -- -- -- nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES nie nieznane nie nie @@ -21462,8 +21582,8 @@ DHCP6 dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan1 wifi NMDeviceWifi -- -- virtual -- -- 71:52:AD:63:5C:7C 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan1 -- nie tak tak nie nie -- -- -- -- nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan1 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/5 -- -- virtual -- -- 71:52:AD:63:5C:7C 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan1 -- nie tak tak nie nie -- -- -- -- nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES nie nieznane nie nie @@ -21562,15 +21682,15 @@ GROUP ADDRESS GATEWAY ROUTE IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar <<< -size: 3198 +size: 3284 location: clients/tests/test-client.py:test_004()/331 cmd: $NMCLI --mode tabular -f all dev show wlan0 lang: C returncode: 0 -stdout: 3045 bytes +stdout: 3131 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES no unknown no no @@ -21602,15 +21722,15 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 3261 +size: 3347 location: clients/tests/test-client.py:test_004()/332 cmd: $NMCLI --mode tabular -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3098 bytes +stdout: 3184 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES nie nieznane nie nie @@ -21642,15 +21762,15 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 1278 +size: 1364 location: clients/tests/test-client.py:test_004()/333 cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 1090 bytes +stdout: 1176 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown HWADDR 13:E0:74:85:7C:D9 @@ -21659,15 +21779,15 @@ NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ MESH WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown no no <<< -size: 1305 +size: 1391 location: clients/tests/test-client.py:test_004()/334 cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1107 bytes +stdout: 1193 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane HWADDR 13:E0:74:85:7C:D9 @@ -21676,15 +21796,15 @@ NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ MES WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane nie nie <<< -size: 1278 +size: 1364 location: clients/tests/test-client.py:test_004()/335 cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 1090 bytes +stdout: 1176 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown HWADDR 13:E0:74:85:7C:D9 @@ -21693,15 +21813,15 @@ NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ MESH WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown no no <<< -size: 1305 +size: 1391 location: clients/tests/test-client.py:test_004()/336 cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1107 bytes +stdout: 1193 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane HWADDR 13:E0:74:85:7C:D9 @@ -21926,15 +22046,15 @@ AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 <<< -size: 3201 +size: 3287 location: clients/tests/test-client.py:test_004()/351 cmd: $NMCLI --mode tabular -f ALL device show wlan0 lang: C returncode: 0 -stdout: 3045 bytes +stdout: 3131 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES no unknown no no @@ -21966,15 +22086,15 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 3264 +size: 3350 location: clients/tests/test-client.py:test_004()/352 cmd: $NMCLI --mode tabular -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3098 bytes +stdout: 3184 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES nie nieznane nie nie @@ -22076,15 +22196,15 @@ GROUP ADDRESS GATEWAY ROUTE IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar <<< -size: 3256 +size: 3342 location: clients/tests/test-client.py:test_004()/355 cmd: $NMCLI --mode tabular -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 2962 bytes +stdout: 3048 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES no unknown no no @@ -22113,15 +22233,15 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 3319 +size: 3405 location: clients/tests/test-client.py:test_004()/356 cmd: $NMCLI --mode tabular -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3015 bytes +stdout: 3101 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES nie nieznane nie nie @@ -22742,15 +22862,15 @@ GROUP ADDRESS GATEWAY ROUTE IP6 2001:a::88ca:3654:96b:ab44/89 -- dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = :: 2001:a::2934:bd66:550d:ec19 sear6.fo.x.y <<< -size: 15860 +size: 16290 location: clients/tests/test-client.py:test_004()/375 cmd: $NMCLI --mode tabular --color yes -f all dev show lang: C returncode: 0 -stdout: 15700 bytes +stdout: 16130 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES no unknown no no @@ -22781,8 +22901,8 @@ DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- AB:B7:BF:E2:48:E8 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth0 -- no yes yes no no -- -- -- -- unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL eth0 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/1 -- -- virtual -- -- AB:B7:BF:E2:48:E8 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth0 -- no yes yes no no -- -- -- -- unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES no 100 Mb/s no no @@ -22808,8 +22928,8 @@ DHCP6 dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL eth1 ethernet NMDeviceEthernet -- -- virtual -- -- E7:78:B1:93:2B:22 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth1 -- no yes yes no no -- -- -- -- unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL eth1 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/2 -- -- virtual -- -- E7:78:B1:93:2B:22 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth1 -- no yes yes no no -- -- -- -- unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES no 100 Mb/s no no @@ -22835,8 +22955,8 @@ DHCP6 dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan1 wifi NMDeviceWifi -- -- virtual -- -- 21:E9:64:81:8C:A8 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan1 -- no yes yes no no -- -- -- -- unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan1 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/4 -- -- virtual -- -- 21:E9:64:81:8C:A8 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan1 -- no yes yes no no -- -- -- -- unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES no unknown no no @@ -22865,8 +22985,8 @@ DHCP6 dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan1 wifi NMDeviceWifi -- -- virtual -- -- 71:52:AD:63:5C:7C 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan1 -- no yes yes no no -- -- -- -- unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan1 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/5 -- -- virtual -- -- 71:52:AD:63:5C:7C 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan1 -- no yes yes no no -- -- -- -- unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES no unknown no no @@ -22895,15 +23015,15 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 16019 +size: 16449 location: clients/tests/test-client.py:test_004()/376 cmd: $NMCLI --mode tabular --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 -stdout: 15849 bytes +stdout: 16279 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES nie nieznane nie nie @@ -22934,8 +23054,8 @@ DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- AB:B7:BF:E2:48:E8 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- -- -- -- nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL eth0 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/1 -- -- virtual -- -- AB:B7:BF:E2:48:E8 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- -- -- -- nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES nie 100 Mb/s nie nie @@ -22961,8 +23081,8 @@ DHCP6 dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL eth1 ethernet NMDeviceEthernet -- -- virtual -- -- E7:78:B1:93:2B:22 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth1 -- nie tak tak nie nie -- -- -- -- nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL eth1 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/2 -- -- virtual -- -- E7:78:B1:93:2B:22 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth1 -- nie tak tak nie nie -- -- -- -- nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES nie 100 Mb/s nie nie @@ -22988,8 +23108,8 @@ DHCP6 dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan1 wifi NMDeviceWifi -- -- virtual -- -- 21:E9:64:81:8C:A8 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan1 -- nie tak tak nie nie -- -- -- -- nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan1 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/4 -- -- virtual -- -- 21:E9:64:81:8C:A8 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan1 -- nie tak tak nie nie -- -- -- -- nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES nie nieznane nie nie @@ -23018,8 +23138,8 @@ DHCP6 dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan1 wifi NMDeviceWifi -- -- virtual -- -- 71:52:AD:63:5C:7C 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan1 -- nie tak tak nie nie -- -- -- -- nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan1 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/5 -- -- virtual -- -- 71:52:AD:63:5C:7C 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan1 -- nie tak tak nie nie -- -- -- -- nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES nie nieznane nie nie @@ -23118,15 +23238,15 @@ GROUP ADDRESS GATEWAY ROUTE IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar <<< -size: 3480 +size: 3566 location: clients/tests/test-client.py:test_004()/379 cmd: $NMCLI --mode tabular --color yes -f all dev show wlan0 lang: C returncode: 0 -stdout: 3315 bytes +stdout: 3401 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES no unknown no no @@ -23158,15 +23278,15 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 3543 +size: 3629 location: clients/tests/test-client.py:test_004()/380 cmd: $NMCLI --mode tabular --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3368 bytes +stdout: 3454 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES nie nieznane nie nie @@ -23198,15 +23318,15 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 1290 +size: 1376 location: clients/tests/test-client.py:test_004()/381 cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 1090 bytes +stdout: 1176 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown HWADDR 13:E0:74:85:7C:D9 @@ -23215,15 +23335,15 @@ NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ MESH WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown no no <<< -size: 1317 +size: 1403 location: clients/tests/test-client.py:test_004()/382 cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1107 bytes +stdout: 1193 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane HWADDR 13:E0:74:85:7C:D9 @@ -23232,15 +23352,15 @@ NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ MES WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane nie nie <<< -size: 1290 +size: 1376 location: clients/tests/test-client.py:test_004()/383 cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 1090 bytes +stdout: 1176 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown HWADDR 13:E0:74:85:7C:D9 @@ -23249,15 +23369,15 @@ NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ MESH WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown no no <<< -size: 1317 +size: 1403 location: clients/tests/test-client.py:test_004()/384 cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1107 bytes +stdout: 1193 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane HWADDR 13:E0:74:85:7C:D9 @@ -23482,15 +23602,15 @@ NAME SSID SSID-HEX BSSID MODE CHAN <<< -size: 3483 +size: 3569 location: clients/tests/test-client.py:test_004()/399 cmd: $NMCLI --mode tabular --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 3315 bytes +stdout: 3401 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES no unknown no no @@ -23522,15 +23642,15 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 3546 +size: 3632 location: clients/tests/test-client.py:test_004()/400 cmd: $NMCLI --mode tabular --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3368 bytes +stdout: 3454 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES nie nieznane nie nie @@ -23632,15 +23752,15 @@ GROUP ADDRESS GATEWAY ROUTE IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar <<< -size: 3538 +size: 3624 location: clients/tests/test-client.py:test_004()/403 cmd: $NMCLI --mode tabular --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 3232 bytes +stdout: 3318 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES no unknown no no @@ -23669,15 +23789,15 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 3601 +size: 3687 location: clients/tests/test-client.py:test_004()/404 cmd: $NMCLI --mode tabular --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3285 bytes +stdout: 3371 bytes >>> -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV CAPABILITIES nie nieznane nie nie @@ -24522,19 +24642,19 @@ GROUP ADDRESS GATEWAY ROUTE IP6 2001:a::88ca:3654:96b:ab44/89 -- dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = :: 2001:a::2934:bd66:550d:ec19 sear6.fo.x.y <<< -size: 23520 +size: 24165 location: clients/tests/test-client.py:test_004()/423 cmd: $NMCLI --mode tabular --pretty -f all dev show lang: C returncode: 0 -stdout: 23363 bytes +stdout: 24008 bytes >>> ========================== Device details (wlan0) ========================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ----------------------------------------------------------- @@ -24577,9 +24697,9 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x ========================= Device details (eth0) ========================= -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- AB:B7:BF:E2:48:E8 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth0 -- no yes yes no no -- -- -- -- unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +GENERAL eth0 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/1 -- -- virtual -- -- AB:B7:BF:E2:48:E8 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth0 -- no yes yes no no -- -- -- -- unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -24616,9 +24736,9 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1} 5fcfd6d7-1 ========================= Device details (eth1) ========================= -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -GENERAL eth1 ethernet NMDeviceEthernet -- -- virtual -- -- E7:78:B1:93:2B:22 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth1 -- no yes yes no no -- -- -- -- unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +GENERAL eth1 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/2 -- -- virtual -- -- E7:78:B1:93:2B:22 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth1 -- no yes yes no no -- -- -- -- unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -24655,9 +24775,9 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1} 5fcfd6d7-1 ========================== Device details (wlan1) ========================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan1 wifi NMDeviceWifi -- -- virtual -- -- 21:E9:64:81:8C:A8 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan1 -- no yes yes no no -- -- -- -- unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan1 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/4 -- -- virtual -- -- 21:E9:64:81:8C:A8 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan1 -- no yes yes no no -- -- -- -- unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ----------------------------------------------------------- @@ -24698,9 +24818,9 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x ========================== Device details (wlan1) ========================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan1 wifi NMDeviceWifi -- -- virtual -- -- 71:52:AD:63:5C:7C 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan1 -- no yes yes no no -- -- -- -- unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan1 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/5 -- -- virtual -- -- 71:52:AD:63:5C:7C 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan1 -- no yes yes no no -- -- -- -- unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ----------------------------------------------------------- @@ -24738,19 +24858,19 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 23881 +size: 24526 location: clients/tests/test-client.py:test_004()/424 cmd: $NMCLI --mode tabular --pretty -f all dev show lang: pl_PL.UTF-8 returncode: 0 -stdout: 23714 bytes +stdout: 24359 bytes >>> =================================== Informacje o urządzeniu (wlan0) =================================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -24793,9 +24913,9 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x ================================== Informacje o urządzeniu (eth0) ================================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- AB:B7:BF:E2:48:E8 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- -- -- -- nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +GENERAL eth0 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/1 -- -- virtual -- -- AB:B7:BF:E2:48:E8 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- -- -- -- nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -24832,9 +24952,9 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1} 5fcfd6d7-1 ================================== Informacje o urządzeniu (eth1) ================================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -GENERAL eth1 ethernet NMDeviceEthernet -- -- virtual -- -- E7:78:B1:93:2B:22 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth1 -- nie tak tak nie nie -- -- -- -- nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +GENERAL eth1 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/2 -- -- virtual -- -- E7:78:B1:93:2B:22 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth1 -- nie tak tak nie nie -- -- -- -- nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -24871,9 +24991,9 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1} 5fcfd6d7-1 =================================== Informacje o urządzeniu (wlan1) =================================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan1 wifi NMDeviceWifi -- -- virtual -- -- 21:E9:64:81:8C:A8 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan1 -- nie tak tak nie nie -- -- -- -- nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan1 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/4 -- -- virtual -- -- 21:E9:64:81:8C:A8 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan1 -- nie tak tak nie nie -- -- -- -- nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -24914,9 +25034,9 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x =================================== Informacje o urządzeniu (wlan1) =================================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan1 wifi NMDeviceWifi -- -- virtual -- -- 71:52:AD:63:5C:7C 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan1 -- nie tak tak nie nie -- -- -- -- nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan1 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/5 -- -- virtual -- -- 71:52:AD:63:5C:7C 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan1 -- nie tak tak nie nie -- -- -- -- nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -25048,19 +25168,19 @@ GROUP ADDRESS GATEWAY ROUTE IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar <<< -size: 4719 +size: 4848 location: clients/tests/test-client.py:test_004()/427 cmd: $NMCLI --mode tabular --pretty -f all dev show wlan0 lang: C returncode: 0 -stdout: 4557 bytes +stdout: 4686 bytes >>> ========================== Device details (wlan0) ========================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ----------------------------------------------------------- @@ -25101,19 +25221,19 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 4827 +size: 4956 location: clients/tests/test-client.py:test_004()/428 cmd: $NMCLI --mode tabular --pretty -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4655 bytes +stdout: 4784 bytes >>> =================================== Informacje o urządzeniu (wlan0) =================================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -25154,19 +25274,19 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 1913 +size: 2042 location: clients/tests/test-client.py:test_004()/429 cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 1716 bytes +stdout: 1845 bytes >>> ========================== Device details (wlan0) ========================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown HWADDR ------------------- @@ -25177,19 +25297,19 @@ NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ MESH WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown no no <<< -size: 1977 +size: 2106 location: clients/tests/test-client.py:test_004()/430 cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1770 bytes +stdout: 1899 bytes >>> =================================== Informacje o urządzeniu (wlan0) =================================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane HWADDR ------------------- @@ -25200,19 +25320,19 @@ NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ MES WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane nie nie <<< -size: 1913 +size: 2042 location: clients/tests/test-client.py:test_004()/431 cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 1716 bytes +stdout: 1845 bytes >>> ========================== Device details (wlan0) ========================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown HWADDR ------------------- @@ -25223,19 +25343,19 @@ NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ MESH WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown no no <<< -size: 1977 +size: 2106 location: clients/tests/test-client.py:test_004()/432 cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1770 bytes +stdout: 1899 bytes >>> =================================== Informacje o urządzeniu (wlan0) =================================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane HWADDR ------------------- @@ -25566,19 +25686,19 @@ AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 <<< -size: 4722 +size: 4851 location: clients/tests/test-client.py:test_004()/447 cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0 lang: C returncode: 0 -stdout: 4557 bytes +stdout: 4686 bytes >>> ========================== Device details (wlan0) ========================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ----------------------------------------------------------- @@ -25619,19 +25739,19 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 4830 +size: 4959 location: clients/tests/test-client.py:test_004()/448 cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4655 bytes +stdout: 4784 bytes >>> =================================== Informacje o urządzeniu (wlan0) =================================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -25766,19 +25886,19 @@ GROUP ADDRESS GATEWAY ROUTE IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar <<< -size: 4735 +size: 4864 location: clients/tests/test-client.py:test_004()/451 cmd: $NMCLI --mode tabular --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 4432 bytes +stdout: 4561 bytes >>> ========================== Device details (wlan0) ========================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ----------------------------------------------------------- @@ -25815,19 +25935,19 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 4843 +size: 4972 location: clients/tests/test-client.py:test_004()/452 cmd: $NMCLI --mode tabular --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4530 bytes +stdout: 4659 bytes >>> =================================== Informacje o urządzeniu (wlan0) =================================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -26688,19 +26808,19 @@ GROUP ADDRESS GATEWAY ROUTE IP6 2001:a::88ca:3654:96b:ab44/89 -- dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = :: 2001:a::2934:bd66:550d:ec19 sear6.fo.x.y <<< -size: 23892 +size: 24537 location: clients/tests/test-client.py:test_004()/471 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show lang: C returncode: 0 -stdout: 23723 bytes +stdout: 24368 bytes >>> ========================== Device details (wlan0) ========================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ----------------------------------------------------------- @@ -26743,9 +26863,9 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x ========================= Device details (eth0) ========================= -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- AB:B7:BF:E2:48:E8 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth0 -- no yes yes no no -- -- -- -- unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +GENERAL eth0 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/1 -- -- virtual -- -- AB:B7:BF:E2:48:E8 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth0 -- no yes yes no no -- -- -- -- unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -26782,9 +26902,9 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1} 5fcfd6d7-1 ========================= Device details (eth1) ========================= -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -GENERAL eth1 ethernet NMDeviceEthernet -- -- virtual -- -- E7:78:B1:93:2B:22 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth1 -- no yes yes no no -- -- -- -- unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +GENERAL eth1 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/2 -- -- virtual -- -- E7:78:B1:93:2B:22 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/eth1 -- no yes yes no no -- -- -- -- unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -26821,9 +26941,9 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1} 5fcfd6d7-1 ========================== Device details (wlan1) ========================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan1 wifi NMDeviceWifi -- -- virtual -- -- 21:E9:64:81:8C:A8 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan1 -- no yes yes no no -- -- -- -- unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan1 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/4 -- -- virtual -- -- 21:E9:64:81:8C:A8 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan1 -- no yes yes no no -- -- -- -- unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ----------------------------------------------------------- @@ -26864,9 +26984,9 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x ========================== Device details (wlan1) ========================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan1 wifi NMDeviceWifi -- -- virtual -- -- 71:52:AD:63:5C:7C 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan1 -- no yes yes no no -- -- -- -- unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan1 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/5 -- -- virtual -- -- 71:52:AD:63:5C:7C 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan1 -- no yes yes no no -- -- -- -- unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ----------------------------------------------------------- @@ -26904,19 +27024,19 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 24253 +size: 24898 location: clients/tests/test-client.py:test_004()/472 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 -stdout: 24074 bytes +stdout: 24719 bytes >>> =================================== Informacje o urządzeniu (wlan0) =================================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -26959,9 +27079,9 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x ================================== Informacje o urządzeniu (eth0) ================================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- AB:B7:BF:E2:48:E8 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- -- -- -- nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +GENERAL eth0 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/1 -- -- virtual -- -- AB:B7:BF:E2:48:E8 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- -- -- -- nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -26998,9 +27118,9 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1} 5fcfd6d7-1 ================================== Informacje o urządzeniu (eth1) ================================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -GENERAL eth1 ethernet NMDeviceEthernet -- -- virtual -- -- E7:78:B1:93:2B:22 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth1 -- nie tak tak nie nie -- -- -- -- nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +GENERAL eth1 ethernet NMDeviceEthernet /org/freedesktop/NetworkManager/Devices/2 -- -- virtual -- -- E7:78:B1:93:2B:22 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/eth1 -- nie tak tak nie nie -- -- -- -- nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -27037,9 +27157,9 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1} 5fcfd6d7-1 =================================== Informacje o urządzeniu (wlan1) =================================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan1 wifi NMDeviceWifi -- -- virtual -- -- 21:E9:64:81:8C:A8 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan1 -- nie tak tak nie nie -- -- -- -- nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan1 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/4 -- -- virtual -- -- 21:E9:64:81:8C:A8 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan1 -- nie tak tak nie nie -- -- -- -- nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -27080,9 +27200,9 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x =================================== Informacje o urządzeniu (wlan1) =================================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan1 wifi NMDeviceWifi -- -- virtual -- -- 71:52:AD:63:5C:7C 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan1 -- nie tak tak nie nie -- -- -- -- nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan1 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/5 -- -- virtual -- -- 71:52:AD:63:5C:7C 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan1 -- nie tak tak nie nie -- -- -- -- nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -27214,19 +27334,19 @@ GROUP ADDRESS GATEWAY ROUTE IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar <<< -size: 5001 +size: 5130 location: clients/tests/test-client.py:test_004()/475 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show wlan0 lang: C returncode: 0 -stdout: 4827 bytes +stdout: 4956 bytes >>> ========================== Device details (wlan0) ========================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ----------------------------------------------------------- @@ -27267,19 +27387,19 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 5109 +size: 5238 location: clients/tests/test-client.py:test_004()/476 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4925 bytes +stdout: 5054 bytes >>> =================================== Informacje o urządzeniu (wlan0) =================================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -27320,19 +27440,19 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 1925 +size: 2054 location: clients/tests/test-client.py:test_004()/477 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 1716 bytes +stdout: 1845 bytes >>> ========================== Device details (wlan0) ========================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown HWADDR ------------------- @@ -27343,19 +27463,19 @@ NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ MESH WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown no no <<< -size: 1989 +size: 2118 location: clients/tests/test-client.py:test_004()/478 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1770 bytes +stdout: 1899 bytes >>> =================================== Informacje o urządzeniu (wlan0) =================================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane HWADDR ------------------- @@ -27366,19 +27486,19 @@ NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ MES WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane nie nie <<< -size: 1925 +size: 2054 location: clients/tests/test-client.py:test_004()/479 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 1716 bytes +stdout: 1845 bytes >>> ========================== Device details (wlan0) ========================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown HWADDR ------------------- @@ -27389,19 +27509,19 @@ NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ MESH WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown no no <<< -size: 1989 +size: 2118 location: clients/tests/test-client.py:test_004()/480 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1770 bytes +stdout: 1899 bytes >>> =================================== Informacje o urządzeniu (wlan0) =================================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane HWADDR ------------------- @@ -27732,19 +27852,19 @@ NAME SSID SSID-HEX BSSID MODE CHAN <<< -size: 5004 +size: 5133 location: clients/tests/test-client.py:test_004()/495 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 4827 bytes +stdout: 4956 bytes >>> ========================== Device details (wlan0) ========================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ----------------------------------------------------------- @@ -27785,19 +27905,19 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 5112 +size: 5241 location: clients/tests/test-client.py:test_004()/496 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4925 bytes +stdout: 5054 bytes >>> =================================== Informacje o urządzeniu (wlan0) =================================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -27932,19 +28052,19 @@ GROUP ADDRESS GATEWAY ROUTE IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar <<< -size: 5017 +size: 5146 location: clients/tests/test-client.py:test_004()/499 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 4702 bytes +stdout: 4831 bytes >>> ========================== Device details (wlan0) ========================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) 0 (unknown) 0 (unknown) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ----------------------------------------------------------- @@ -27981,19 +28101,19 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 5125 +size: 5254 location: clients/tests/test-client.py:test_004()/500 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4800 bytes +stdout: 4929 bytes >>> =================================== Informacje o urządzeniu (wlan0) =================================== -NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane +NAME DEVICE TYPE NM-TYPE DBUS-PATH VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON IP4-CONNECTIVITY IP6-CONNECTIVITY UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi /org/freedesktop/NetworkManager/Devices/3 -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) 0 (nieznane) 0 (nieznane) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV ------------------------------------------------------------ @@ -28372,14 +28492,14 @@ IP4:192.168.97.124/29 | 192.168.76.154/18::dst = 192.168.33.233/22, nh = 192.168 IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0/85, nh = \:\:, mt = 2821465568 | dst = 2001\:a\:\:a976\:2488\:f49f\:b48/106, nh = 2001\:a\:\:62ae\:c734\:fc7b\:e931, mt = 2248613879 | dst = 2001\:a\:\:afb7\:4449\:3787\:8bb4/123, nh = \:\::2001\:a\:\:2934\:bd66\:550d\:ec19:sear6.fo.x.y <<< -size: 6555 +size: 6765 location: clients/tests/test-client.py:test_004()/519 cmd: $NMCLI --mode tabular --terse -f all dev show lang: C returncode: 0 -stdout: 6400 bytes +stdout: 6610 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown +GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:no:unknown:no:no INTERFACE-FLAGS:yes:yes:no WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no @@ -28392,7 +28512,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no:::::unknown +GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no:::::unknown CAPABILITIES:no:100 Mb/s:no:no INTERFACE-FLAGS:yes:yes:no WIRED-PROPERTIES:off: @@ -28402,7 +28522,7 @@ IP6:2001\:a\:\:ed81\:3d7\:c2e9\:df82/99:::2001\:a\:\:2703\:f06\:9619\:d89f | 200 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -GENERAL:eth1:ethernet:NMDeviceEthernet:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::no:yes:yes:no:no:::::unknown +GENERAL:eth1:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/2:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::no:yes:yes:no:no:::::unknown CAPABILITIES:no:100 Mb/s:no:no INTERFACE-FLAGS:yes:yes:no WIRED-PROPERTIES:off: @@ -28412,7 +28532,7 @@ IP6:2001\:a\:\:1c1\:c178\:169f\:2b80/93 | 2001\:a\:\:1f79\:e0fb\:87b9\:3cc6/123: DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown +GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/4:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown CAPABILITIES:no:unknown:no:no INTERFACE-FLAGS:yes:yes:no WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no @@ -28423,7 +28543,7 @@ IP6:2001\:a\:\:fa05\:2ab4\:9300\:e8fe/116 | 2001\:a\:\:e9cf\:bd3\:caba\:99b3/86 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-9 = val-9 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown +GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/5:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown CAPABILITIES:no:unknown:no:no INTERFACE-FLAGS:yes:yes:no WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no @@ -28434,14 +28554,14 @@ DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 6601 +size: 6811 location: clients/tests/test-client.py:test_004()/520 cmd: $NMCLI --mode tabular --terse -f all dev show lang: pl_PL.UTF-8 returncode: 0 -stdout: 6436 bytes +stdout: 6646 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown +GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:no:unknown:no:no INTERFACE-FLAGS:yes:yes:no WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no @@ -28454,7 +28574,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no:::::unknown +GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no:::::unknown CAPABILITIES:no:100 Mb/s:no:no INTERFACE-FLAGS:yes:yes:no WIRED-PROPERTIES:off: @@ -28464,7 +28584,7 @@ IP6:2001\:a\:\:ed81\:3d7\:c2e9\:df82/99:::2001\:a\:\:2703\:f06\:9619\:d89f | 200 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -GENERAL:eth1:ethernet:NMDeviceEthernet:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::no:yes:yes:no:no:::::unknown +GENERAL:eth1:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/2:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::no:yes:yes:no:no:::::unknown CAPABILITIES:no:100 Mb/s:no:no INTERFACE-FLAGS:yes:yes:no WIRED-PROPERTIES:off: @@ -28474,7 +28594,7 @@ IP6:2001\:a\:\:1c1\:c178\:169f\:2b80/93 | 2001\:a\:\:1f79\:e0fb\:87b9\:3cc6/123: DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown +GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/4:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown CAPABILITIES:no:unknown:no:no INTERFACE-FLAGS:yes:yes:no WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no @@ -28485,7 +28605,7 @@ IP6:2001\:a\:\:fa05\:2ab4\:9300\:e8fe/116 | 2001\:a\:\:e9cf\:bd3\:caba\:99b3/86 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-9 = val-9 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown +GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/5:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown CAPABILITIES:no:unknown:no:no INTERFACE-FLAGS:yes:yes:no WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no @@ -28532,14 +28652,14 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar <<< -size: 1452 +size: 1494 location: clients/tests/test-client.py:test_004()/523 cmd: $NMCLI --mode tabular --terse -f all dev show wlan0 lang: C returncode: 0 -stdout: 1291 bytes +stdout: 1333 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown +GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:no:unknown:no:no INTERFACE-FLAGS:yes:yes:no WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no @@ -28553,14 +28673,14 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 1489 +size: 1531 location: clients/tests/test-client.py:test_004()/524 cmd: $NMCLI --mode tabular --terse -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1318 bytes +stdout: 1360 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown +GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:no:unknown:no:no INTERFACE-FLAGS:yes:yes:no WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no @@ -28574,50 +28694,50 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 566 +size: 608 location: clients/tests/test-client.py:test_004()/525 cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 371 bytes +stdout: 413 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown +GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown 13\:E0\:74\:85\:7C\:D9 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no <<< -size: 576 +size: 618 location: clients/tests/test-client.py:test_004()/526 cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 371 bytes +stdout: 413 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown +GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown 13\:E0\:74\:85\:7C\:D9 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no <<< -size: 566 +size: 608 location: clients/tests/test-client.py:test_004()/527 cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 371 bytes +stdout: 413 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown +GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown 13\:E0\:74\:85\:7C\:D9 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no <<< -size: 576 +size: 618 location: clients/tests/test-client.py:test_004()/528 cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 371 bytes +stdout: 413 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown +GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown 13\:E0\:74\:85\:7C\:D9 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no @@ -28812,14 +28932,14 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:24 <<< -size: 1455 +size: 1497 location: clients/tests/test-client.py:test_004()/543 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0 lang: C returncode: 0 -stdout: 1291 bytes +stdout: 1333 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown +GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:no:unknown:no:no INTERFACE-FLAGS:yes:yes:no WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no @@ -28833,14 +28953,14 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 1492 +size: 1534 location: clients/tests/test-client.py:test_004()/544 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1318 bytes +stdout: 1360 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown +GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:no:unknown:no:no INTERFACE-FLAGS:yes:yes:no WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no @@ -28890,14 +29010,14 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar <<< -size: 1566 +size: 1608 location: clients/tests/test-client.py:test_004()/547 cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 1264 bytes +stdout: 1306 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown +GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:no:unknown:no:no WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2 @@ -28910,14 +29030,14 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 1603 +size: 1645 location: clients/tests/test-client.py:test_004()/548 cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1291 bytes +stdout: 1333 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown +GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:no:unknown:no:no WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2 @@ -29262,14 +29382,14 @@ IP4:192.168.97.124/29 | 192.168.76.154/18::dst = 192.168.33.233/22, nh = 192.168 IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0/85, nh = \:\:, mt = 2821465568 | dst = 2001\:a\:\:a976\:2488\:f49f\:b48/106, nh = 2001\:a\:\:62ae\:c734\:fc7b\:e931, mt = 2248613879 | dst = 2001\:a\:\:afb7\:4449\:3787\:8bb4/123, nh = \:\::2001\:a\:\:2934\:bd66\:550d\:ec19:sear6.fo.x.y <<< -size: 6927 +size: 7137 location: clients/tests/test-client.py:test_004()/567 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show lang: C returncode: 0 -stdout: 6760 bytes +stdout: 6970 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown +GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:no:unknown:no:no INTERFACE-FLAGS:yes:yes:no WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no @@ -29282,7 +29402,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no:::::unknown +GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no:::::unknown CAPABILITIES:no:100 Mb/s:no:no INTERFACE-FLAGS:yes:yes:no WIRED-PROPERTIES:off: @@ -29292,7 +29412,7 @@ IP6:2001\:a\:\:ed81\:3d7\:c2e9\:df82/99:::2001\:a\:\:2703\:f06\:9619\:d89f | 200 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -GENERAL:eth1:ethernet:NMDeviceEthernet:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::no:yes:yes:no:no:::::unknown +GENERAL:eth1:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/2:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::no:yes:yes:no:no:::::unknown CAPABILITIES:no:100 Mb/s:no:no INTERFACE-FLAGS:yes:yes:no WIRED-PROPERTIES:off: @@ -29302,7 +29422,7 @@ IP6:2001\:a\:\:1c1\:c178\:169f\:2b80/93 | 2001\:a\:\:1f79\:e0fb\:87b9\:3cc6/123: DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown +GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/4:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown CAPABILITIES:no:unknown:no:no INTERFACE-FLAGS:yes:yes:no WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no @@ -29313,7 +29433,7 @@ IP6:2001\:a\:\:fa05\:2ab4\:9300\:e8fe/116 | 2001\:a\:\:e9cf\:bd3\:caba\:99b3/86 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-9 = val-9 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown +GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/5:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown CAPABILITIES:no:unknown:no:no INTERFACE-FLAGS:yes:yes:no WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no @@ -29324,14 +29444,14 @@ DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 6973 +size: 7183 location: clients/tests/test-client.py:test_004()/568 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 -stdout: 6796 bytes +stdout: 7006 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown +GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:no:unknown:no:no INTERFACE-FLAGS:yes:yes:no WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no @@ -29344,7 +29464,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no:::::unknown +GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no:::::unknown CAPABILITIES:no:100 Mb/s:no:no INTERFACE-FLAGS:yes:yes:no WIRED-PROPERTIES:off: @@ -29354,7 +29474,7 @@ IP6:2001\:a\:\:ed81\:3d7\:c2e9\:df82/99:::2001\:a\:\:2703\:f06\:9619\:d89f | 200 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -GENERAL:eth1:ethernet:NMDeviceEthernet:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::no:yes:yes:no:no:::::unknown +GENERAL:eth1:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/2:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::no:yes:yes:no:no:::::unknown CAPABILITIES:no:100 Mb/s:no:no INTERFACE-FLAGS:yes:yes:no WIRED-PROPERTIES:off: @@ -29364,7 +29484,7 @@ IP6:2001\:a\:\:1c1\:c178\:169f\:2b80/93 | 2001\:a\:\:1f79\:e0fb\:87b9\:3cc6/123: DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown +GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/4:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown CAPABILITIES:no:unknown:no:no INTERFACE-FLAGS:yes:yes:no WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no @@ -29375,7 +29495,7 @@ IP6:2001\:a\:\:fa05\:2ab4\:9300\:e8fe/116 | 2001\:a\:\:e9cf\:bd3\:caba\:99b3/86 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-9 = val-9 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown +GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/5:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown CAPABILITIES:no:unknown:no:no INTERFACE-FLAGS:yes:yes:no WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no @@ -29422,14 +29542,14 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar <<< -size: 1734 +size: 1776 location: clients/tests/test-client.py:test_004()/571 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show wlan0 lang: C returncode: 0 -stdout: 1561 bytes +stdout: 1603 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown +GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:no:unknown:no:no INTERFACE-FLAGS:yes:yes:no WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no @@ -29443,14 +29563,14 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 1771 +size: 1813 location: clients/tests/test-client.py:test_004()/572 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1588 bytes +stdout: 1630 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown +GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:no:unknown:no:no INTERFACE-FLAGS:yes:yes:no WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no @@ -29464,50 +29584,50 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 578 +size: 620 location: clients/tests/test-client.py:test_004()/573 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 371 bytes +stdout: 413 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown +GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown 13\:E0\:74\:85\:7C\:D9 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no <<< -size: 588 +size: 630 location: clients/tests/test-client.py:test_004()/574 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 371 bytes +stdout: 413 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown +GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown 13\:E0\:74\:85\:7C\:D9 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no <<< -size: 578 +size: 620 location: clients/tests/test-client.py:test_004()/575 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 371 bytes +stdout: 413 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown +GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown 13\:E0\:74\:85\:7C\:D9 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no <<< -size: 588 +size: 630 location: clients/tests/test-client.py:test_004()/576 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 371 bytes +stdout: 413 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown +GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown 13\:E0\:74\:85\:7C\:D9 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no @@ -29702,14 +29822,14 @@ stdout: 422 bytes <<< -size: 1737 +size: 1779 location: clients/tests/test-client.py:test_004()/591 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 1561 bytes +stdout: 1603 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown +GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:no:unknown:no:no INTERFACE-FLAGS:yes:yes:no WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no @@ -29723,14 +29843,14 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 1774 +size: 1816 location: clients/tests/test-client.py:test_004()/592 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1588 bytes +stdout: 1630 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown +GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:no:unknown:no:no INTERFACE-FLAGS:yes:yes:no WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no @@ -29780,14 +29900,14 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar <<< -size: 1848 +size: 1890 location: clients/tests/test-client.py:test_004()/595 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 1534 bytes +stdout: 1576 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown +GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:no:unknown:no:no WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2 @@ -29800,14 +29920,14 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 1885 +size: 1927 location: clients/tests/test-client.py:test_004()/596 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1561 bytes +stdout: 1603 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown +GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:no:unknown:no:no WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2 @@ -30994,16 +31114,17 @@ IP6.DNS[1]: 2001:a::2934:bd66:550d:ec19 IP6.DOMAIN[1]: sear6.fo.x.y <<< -size: 21818 +size: 22228 location: clients/tests/test-client.py:test_004()/615 cmd: $NMCLI --mode multiline -f all dev show lang: C returncode: 0 -stdout: 21668 bytes +stdout: 22078 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -31104,6 +31225,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -31170,6 +31292,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: eth1 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/2 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -31243,6 +31366,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/4 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -31337,6 +31461,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/5 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -31408,16 +31533,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 21979 +size: 22389 location: clients/tests/test-client.py:test_004()/616 cmd: $NMCLI --mode multiline -f all dev show lang: pl_PL.UTF-8 returncode: 0 -stdout: 21819 bytes +stdout: 22229 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -31518,6 +31644,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -31584,6 +31711,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: eth1 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/2 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -31657,6 +31785,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/4 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -31751,6 +31880,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/5 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -31888,16 +32018,17 @@ IP6.DOMAIN[5]: sear6.foo3.bar IP6.DOMAIN[6]: sear6.foo4.bar <<< -size: 5251 +size: 5333 location: clients/tests/test-client.py:test_004()/619 cmd: $NMCLI --mode multiline -f all dev show wlan0 lang: C returncode: 0 -stdout: 5096 bytes +stdout: 5178 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -31996,16 +32127,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 5309 +size: 5391 location: clients/tests/test-client.py:test_004()/620 cmd: $NMCLI --mode multiline -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5144 bytes +stdout: 5226 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -32104,16 +32236,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 2059 +size: 2141 location: clients/tests/test-client.py:test_004()/621 cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 1869 bytes +stdout: 1951 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -32151,16 +32284,17 @@ WIFI-PROPERTIES.MESH: no WIFI-PROPERTIES.IBSS-RSN: no <<< -size: 2085 +size: 2167 location: clients/tests/test-client.py:test_004()/622 cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1885 bytes +stdout: 1967 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -32198,16 +32332,17 @@ WIFI-PROPERTIES.MESH: nie WIFI-PROPERTIES.IBSS-RSN: nie <<< -size: 2059 +size: 2141 location: clients/tests/test-client.py:test_004()/623 cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 1869 bytes +stdout: 1951 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -32245,16 +32380,17 @@ WIFI-PROPERTIES.MESH: no WIFI-PROPERTIES.IBSS-RSN: no <<< -size: 2085 +size: 2167 location: clients/tests/test-client.py:test_004()/624 cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1885 bytes +stdout: 1967 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -32902,16 +33038,17 @@ DBUS-PATH: /org/freedesktop/NetworkManager/AccessPo <<< -size: 5254 +size: 5336 location: clients/tests/test-client.py:test_004()/639 cmd: $NMCLI --mode multiline -f ALL device show wlan0 lang: C returncode: 0 -stdout: 5096 bytes +stdout: 5178 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -33010,16 +33147,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 5312 +size: 5394 location: clients/tests/test-client.py:test_004()/640 cmd: $NMCLI --mode multiline -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5144 bytes +stdout: 5226 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -33184,16 +33322,17 @@ IP6.DOMAIN[5]: sear6.foo3.bar IP6.DOMAIN[6]: sear6.foo4.bar <<< -size: 5261 +size: 5343 location: clients/tests/test-client.py:test_004()/643 cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 4965 bytes +stdout: 5047 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -33289,16 +33428,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 5318 +size: 5400 location: clients/tests/test-client.py:test_004()/644 cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5012 bytes +stdout: 5094 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -34604,16 +34744,17 @@ IP6.DNS[1]: 2001:a::2934:bd66:550d:ec19 IP6.DOMAIN[1]: sear6.fo.x.y <<< -size: 22154 +size: 22564 location: clients/tests/test-client.py:test_004()/663 cmd: $NMCLI --mode multiline --color yes -f all dev show lang: C returncode: 0 -stdout: 21992 bytes +stdout: 22402 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -34714,6 +34855,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -34780,6 +34922,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: eth1 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/2 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -34853,6 +34996,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/4 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -34947,6 +35091,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/5 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -35018,16 +35163,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 22315 +size: 22725 location: clients/tests/test-client.py:test_004()/664 cmd: $NMCLI --mode multiline --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 -stdout: 22143 bytes +stdout: 22553 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -35128,6 +35274,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -35194,6 +35341,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: eth1 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/2 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -35267,6 +35415,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/4 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -35361,6 +35510,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/5 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -35498,16 +35648,17 @@ IP6.DOMAIN[5]: sear6.foo3.bar IP6.DOMAIN[6]: sear6.foo4.bar <<< -size: 5506 +size: 5588 location: clients/tests/test-client.py:test_004()/667 cmd: $NMCLI --mode multiline --color yes -f all dev show wlan0 lang: C returncode: 0 -stdout: 5339 bytes +stdout: 5421 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -35606,16 +35757,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 5564 +size: 5646 location: clients/tests/test-client.py:test_004()/668 cmd: $NMCLI --mode multiline --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5387 bytes +stdout: 5469 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -35714,16 +35866,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 2071 +size: 2153 location: clients/tests/test-client.py:test_004()/669 cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 1869 bytes +stdout: 1951 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -35761,16 +35914,17 @@ WIFI-PROPERTIES.MESH: no WIFI-PROPERTIES.IBSS-RSN: no <<< -size: 2097 +size: 2179 location: clients/tests/test-client.py:test_004()/670 cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1885 bytes +stdout: 1967 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -35808,16 +35962,17 @@ WIFI-PROPERTIES.MESH: nie WIFI-PROPERTIES.IBSS-RSN: nie <<< -size: 2071 +size: 2153 location: clients/tests/test-client.py:test_004()/671 cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 1869 bytes +stdout: 1951 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -35855,16 +36010,17 @@ WIFI-PROPERTIES.MESH: no WIFI-PROPERTIES.IBSS-RSN: no <<< -size: 2097 +size: 2179 location: clients/tests/test-client.py:test_004()/672 cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1885 bytes +stdout: 1967 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -36512,16 +36668,17 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Acc <<< -size: 5509 +size: 5591 location: clients/tests/test-client.py:test_004()/687 cmd: $NMCLI --mode multiline --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 5339 bytes +stdout: 5421 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -36620,16 +36777,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 5567 +size: 5649 location: clients/tests/test-client.py:test_004()/688 cmd: $NMCLI --mode multiline --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5387 bytes +stdout: 5469 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -36794,16 +36952,17 @@ IP6.DOMAIN[5]: sear6.foo3.bar IP6.DOMAIN[6]: sear6.foo4.bar <<< -size: 5516 +size: 5598 location: clients/tests/test-client.py:test_004()/691 cmd: $NMCLI --mode multiline --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 5208 bytes +stdout: 5290 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -36899,16 +37058,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 5573 +size: 5655 location: clients/tests/test-client.py:test_004()/692 cmd: $NMCLI --mode multiline --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5255 bytes +stdout: 5337 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -38454,12 +38614,12 @@ IP6.DOMAIN[1]: sear6.fo.x.y ------------------------------------------------------------------------------- <<< -size: 26802 +size: 27212 location: clients/tests/test-client.py:test_004()/711 cmd: $NMCLI --mode multiline --pretty -f all dev show lang: C returncode: 0 -stdout: 26643 bytes +stdout: 27053 bytes >>> =============================================================================== Device details (wlan0) @@ -38467,6 +38627,7 @@ stdout: 26643 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -38582,6 +38743,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -38660,6 +38822,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: eth1 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/2 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -38745,6 +38908,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/4 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -38852,6 +39016,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/5 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -38932,12 +39097,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -size: 26996 +size: 27406 location: clients/tests/test-client.py:test_004()/712 cmd: $NMCLI --mode multiline --pretty -f all dev show lang: pl_PL.UTF-8 returncode: 0 -stdout: 26827 bytes +stdout: 27237 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -38945,6 +39110,7 @@ stdout: 26827 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -39060,6 +39226,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -39138,6 +39305,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: eth1 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/2 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -39223,6 +39391,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/4 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -39330,6 +39499,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/5 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -39500,12 +39670,12 @@ IP6.DOMAIN[6]: sear6.foo4.bar ------------------------------------------------------------------------------- <<< -size: 6431 +size: 6513 location: clients/tests/test-client.py:test_004()/715 cmd: $NMCLI --mode multiline --pretty -f all dev show wlan0 lang: C returncode: 0 -stdout: 6267 bytes +stdout: 6349 bytes >>> =============================================================================== Device details (wlan0) @@ -39513,6 +39683,7 @@ stdout: 6267 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -39623,12 +39794,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -size: 6496 +size: 6578 location: clients/tests/test-client.py:test_004()/716 cmd: $NMCLI --mode multiline --pretty -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 6322 bytes +stdout: 6404 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -39636,6 +39807,7 @@ stdout: 6322 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -39746,12 +39918,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -size: 2519 +size: 2601 location: clients/tests/test-client.py:test_004()/717 cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 2320 bytes +stdout: 2402 bytes >>> =============================================================================== Device details (wlan0) @@ -39759,6 +39931,7 @@ stdout: 2320 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -39799,12 +39972,12 @@ WIFI-PROPERTIES.IBSS-RSN: no ------------------------------------------------------------------------------- <<< -size: 2552 +size: 2634 location: clients/tests/test-client.py:test_004()/718 cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2343 bytes +stdout: 2425 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -39812,6 +39985,7 @@ stdout: 2343 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -39852,12 +40026,12 @@ WIFI-PROPERTIES.IBSS-RSN: nie ------------------------------------------------------------------------------- <<< -size: 2519 +size: 2601 location: clients/tests/test-client.py:test_004()/719 cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 2320 bytes +stdout: 2402 bytes >>> =============================================================================== Device details (wlan0) @@ -39865,6 +40039,7 @@ stdout: 2320 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -39905,12 +40080,12 @@ WIFI-PROPERTIES.IBSS-RSN: no ------------------------------------------------------------------------------- <<< -size: 2552 +size: 2634 location: clients/tests/test-client.py:test_004()/720 cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2343 bytes +stdout: 2425 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -39918,6 +40093,7 @@ stdout: 2343 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -40686,12 +40862,12 @@ DBUS-PATH: /org/freedesktop/NetworkManager/AccessPo <<< -size: 6434 +size: 6516 location: clients/tests/test-client.py:test_004()/735 cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0 lang: C returncode: 0 -stdout: 6267 bytes +stdout: 6349 bytes >>> =============================================================================== Device details (wlan0) @@ -40699,6 +40875,7 @@ stdout: 6267 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -40809,12 +40986,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -size: 6499 +size: 6581 location: clients/tests/test-client.py:test_004()/736 cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 6322 bytes +stdout: 6404 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -40822,6 +40999,7 @@ stdout: 6322 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -41022,12 +41200,12 @@ IP6.DOMAIN[6]: sear6.foo4.bar ------------------------------------------------------------------------------- <<< -size: 6361 +size: 6443 location: clients/tests/test-client.py:test_004()/739 cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 6056 bytes +stdout: 6138 bytes >>> =============================================================================== Device details (wlan0) @@ -41035,6 +41213,7 @@ stdout: 6056 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -41141,12 +41320,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -size: 6425 +size: 6507 location: clients/tests/test-client.py:test_004()/740 cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 6110 bytes +stdout: 6192 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -41154,6 +41333,7 @@ stdout: 6110 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -42722,12 +42902,12 @@ IP6.DOMAIN[1]: sear6.fo.x.y ------------------------------------------------------------------------------- <<< -size: 27138 +size: 27548 location: clients/tests/test-client.py:test_004()/759 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show lang: C returncode: 0 -stdout: 26967 bytes +stdout: 27377 bytes >>> =============================================================================== Device details (wlan0) @@ -42735,6 +42915,7 @@ stdout: 26967 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -42850,6 +43031,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -42928,6 +43110,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: eth1 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/2 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -43013,6 +43196,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/4 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -43120,6 +43304,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/5 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -43200,12 +43385,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -size: 27332 +size: 27742 location: clients/tests/test-client.py:test_004()/760 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 -stdout: 27151 bytes +stdout: 27561 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -43213,6 +43398,7 @@ stdout: 27151 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -43328,6 +43514,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -43406,6 +43593,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: eth1 GENERAL.TYPE: ethernet GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/2 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -43491,6 +43679,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/4 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -43598,6 +43787,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c GENERAL.DEVICE: wlan1 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/5 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -43768,12 +43958,12 @@ IP6.DOMAIN[6]: sear6.foo4.bar ------------------------------------------------------------------------------- <<< -size: 6686 +size: 6768 location: clients/tests/test-client.py:test_004()/763 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show wlan0 lang: C returncode: 0 -stdout: 6510 bytes +stdout: 6592 bytes >>> =============================================================================== Device details (wlan0) @@ -43781,6 +43971,7 @@ stdout: 6510 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -43891,12 +44082,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -size: 6751 +size: 6833 location: clients/tests/test-client.py:test_004()/764 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 6565 bytes +stdout: 6647 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -43904,6 +44095,7 @@ stdout: 6565 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -44014,12 +44206,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -size: 2531 +size: 2613 location: clients/tests/test-client.py:test_004()/765 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 2320 bytes +stdout: 2402 bytes >>> =============================================================================== Device details (wlan0) @@ -44027,6 +44219,7 @@ stdout: 2320 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -44067,12 +44260,12 @@ WIFI-PROPERTIES.IBSS-RSN: no ------------------------------------------------------------------------------- <<< -size: 2564 +size: 2646 location: clients/tests/test-client.py:test_004()/766 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2343 bytes +stdout: 2425 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -44080,6 +44273,7 @@ stdout: 2343 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -44120,12 +44314,12 @@ WIFI-PROPERTIES.IBSS-RSN: nie ------------------------------------------------------------------------------- <<< -size: 2531 +size: 2613 location: clients/tests/test-client.py:test_004()/767 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 2320 bytes +stdout: 2402 bytes >>> =============================================================================== Device details (wlan0) @@ -44133,6 +44327,7 @@ stdout: 2320 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -44173,12 +44368,12 @@ WIFI-PROPERTIES.IBSS-RSN: no ------------------------------------------------------------------------------- <<< -size: 2564 +size: 2646 location: clients/tests/test-client.py:test_004()/768 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2343 bytes +stdout: 2425 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -44186,6 +44381,7 @@ stdout: 2343 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -44954,12 +45150,12 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Acc <<< -size: 6689 +size: 6771 location: clients/tests/test-client.py:test_004()/783 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 6510 bytes +stdout: 6592 bytes >>> =============================================================================== Device details (wlan0) @@ -44967,6 +45163,7 @@ stdout: 6510 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -45077,12 +45274,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -size: 6754 +size: 6836 location: clients/tests/test-client.py:test_004()/784 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 6565 bytes +stdout: 6647 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -45090,6 +45287,7 @@ stdout: 6565 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -45290,12 +45488,12 @@ IP6.DOMAIN[6]: sear6.foo4.bar ------------------------------------------------------------------------------- <<< -size: 6616 +size: 6698 location: clients/tests/test-client.py:test_004()/787 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 6299 bytes +stdout: 6381 bytes >>> =============================================================================== Device details (wlan0) @@ -45303,6 +45501,7 @@ stdout: 6299 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -45409,12 +45608,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -size: 6680 +size: 6762 location: clients/tests/test-client.py:test_004()/788 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 6353 bytes +stdout: 6435 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -45422,6 +45621,7 @@ stdout: 6353 bytes GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: -- GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual @@ -46750,16 +46950,17 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19 IP6.DOMAIN[1]:sear6.fo.x.y <<< -size: 12610 +size: 12910 location: clients/tests/test-client.py:test_004()/807 cmd: $NMCLI --mode multiline --terse -f all dev show lang: C returncode: 0 -stdout: 12452 bytes +stdout: 12752 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -46860,6 +47061,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -46926,6 +47128,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con- GENERAL.DEVICE:eth1 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -46999,6 +47202,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con- GENERAL.DEVICE:wlan1 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -47093,6 +47297,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- GENERAL.DEVICE:wlan1 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -47164,16 +47369,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 12656 +size: 12956 location: clients/tests/test-client.py:test_004()/808 cmd: $NMCLI --mode multiline --terse -f all dev show lang: pl_PL.UTF-8 returncode: 0 -stdout: 12488 bytes +stdout: 12788 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -47274,6 +47480,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -47340,6 +47547,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con- GENERAL.DEVICE:eth1 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -47413,6 +47621,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con- GENERAL.DEVICE:wlan1 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -47507,6 +47716,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- GENERAL.DEVICE:wlan1 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -47644,16 +47854,17 @@ IP6.DOMAIN[5]:sear6.foo3.bar IP6.DOMAIN[6]:sear6.foo4.bar <<< -size: 2926 +size: 2986 location: clients/tests/test-client.py:test_004()/811 cmd: $NMCLI --mode multiline --terse -f all dev show wlan0 lang: C returncode: 0 -stdout: 2763 bytes +stdout: 2823 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -47752,16 +47963,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 2963 +size: 3023 location: clients/tests/test-client.py:test_004()/812 cmd: $NMCLI --mode multiline --terse -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2790 bytes +stdout: 2850 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -47860,16 +48072,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 1255 +size: 1315 location: clients/tests/test-client.py:test_004()/813 cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 1057 bytes +stdout: 1117 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -47907,16 +48120,17 @@ WIFI-PROPERTIES.MESH:no WIFI-PROPERTIES.IBSS-RSN:no <<< -size: 1265 +size: 1325 location: clients/tests/test-client.py:test_004()/814 cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1057 bytes +stdout: 1117 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -47954,16 +48168,17 @@ WIFI-PROPERTIES.MESH:no WIFI-PROPERTIES.IBSS-RSN:no <<< -size: 1255 +size: 1315 location: clients/tests/test-client.py:test_004()/815 cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 1057 bytes +stdout: 1117 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -48001,16 +48216,17 @@ WIFI-PROPERTIES.MESH:no WIFI-PROPERTIES.IBSS-RSN:no <<< -size: 1265 +size: 1325 location: clients/tests/test-client.py:test_004()/816 cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1057 bytes +stdout: 1117 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -48658,16 +48874,17 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2 <<< -size: 2929 +size: 2989 location: clients/tests/test-client.py:test_004()/831 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0 lang: C returncode: 0 -stdout: 2763 bytes +stdout: 2823 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -48766,16 +48983,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 2966 +size: 3026 location: clients/tests/test-client.py:test_004()/832 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2790 bytes +stdout: 2850 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -48940,16 +49158,17 @@ IP6.DOMAIN[5]:sear6.foo3.bar IP6.DOMAIN[6]:sear6.foo4.bar <<< -size: 2988 +size: 3048 location: clients/tests/test-client.py:test_004()/835 cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 2684 bytes +stdout: 2744 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -49045,16 +49264,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 3025 +size: 3085 location: clients/tests/test-client.py:test_004()/836 cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2711 bytes +stdout: 2771 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -50360,16 +50580,17 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19 IP6.DOMAIN[1]:sear6.fo.x.y <<< -size: 12946 +size: 13246 location: clients/tests/test-client.py:test_004()/855 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show lang: C returncode: 0 -stdout: 12776 bytes +stdout: 13076 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -50470,6 +50691,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -50536,6 +50758,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con- GENERAL.DEVICE:eth1 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -50609,6 +50832,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con- GENERAL.DEVICE:wlan1 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -50703,6 +50927,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- GENERAL.DEVICE:wlan1 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -50774,16 +50999,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 12992 +size: 13292 location: clients/tests/test-client.py:test_004()/856 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 -stdout: 12812 bytes +stdout: 13112 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -50884,6 +51110,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -50950,6 +51177,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con- GENERAL.DEVICE:eth1 GENERAL.TYPE:ethernet GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -51023,6 +51251,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con- GENERAL.DEVICE:wlan1 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -51117,6 +51346,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- GENERAL.DEVICE:wlan1 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -51254,16 +51484,17 @@ IP6.DOMAIN[5]:sear6.foo3.bar IP6.DOMAIN[6]:sear6.foo4.bar <<< -size: 3181 +size: 3241 location: clients/tests/test-client.py:test_004()/859 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show wlan0 lang: C returncode: 0 -stdout: 3006 bytes +stdout: 3066 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -51362,16 +51593,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 3218 +size: 3278 location: clients/tests/test-client.py:test_004()/860 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3033 bytes +stdout: 3093 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -51470,16 +51702,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 1267 +size: 1327 location: clients/tests/test-client.py:test_004()/861 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 1057 bytes +stdout: 1117 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -51517,16 +51750,17 @@ WIFI-PROPERTIES.MESH:no WIFI-PROPERTIES.IBSS-RSN:no <<< -size: 1277 +size: 1337 location: clients/tests/test-client.py:test_004()/862 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1057 bytes +stdout: 1117 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -51564,16 +51798,17 @@ WIFI-PROPERTIES.MESH:no WIFI-PROPERTIES.IBSS-RSN:no <<< -size: 1267 +size: 1327 location: clients/tests/test-client.py:test_004()/863 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 -stdout: 1057 bytes +stdout: 1117 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -51611,16 +51846,17 @@ WIFI-PROPERTIES.MESH:no WIFI-PROPERTIES.IBSS-RSN:no <<< -size: 1277 +size: 1337 location: clients/tests/test-client.py:test_004()/864 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1057 bytes +stdout: 1117 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -52268,16 +52504,17 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2 <<< -size: 3184 +size: 3244 location: clients/tests/test-client.py:test_004()/879 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 3006 bytes +stdout: 3066 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -52376,16 +52613,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 3221 +size: 3281 location: clients/tests/test-client.py:test_004()/880 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3033 bytes +stdout: 3093 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -52550,16 +52788,17 @@ IP6.DOMAIN[5]:sear6.foo3.bar IP6.DOMAIN[6]:sear6.foo4.bar <<< -size: 3243 +size: 3303 location: clients/tests/test-client.py:test_004()/883 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 2927 bytes +stdout: 2987 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual @@ -52655,16 +52894,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 3280 +size: 3340 location: clients/tests/test-client.py:test_004()/884 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2954 bytes +stdout: 3014 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3 GENERAL.VENDOR: GENERAL.PRODUCT: GENERAL.DRIVER:virtual From 53b74bc6148b8001b4dcec700d2fc65de41679aa Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 11 Dec 2019 09:22:47 +0100 Subject: [PATCH 070/109] n-dhcp4/socket: use SO_REUSEADDR on UDP socket Otherwise, other applications cannot bind to port 0.0.0.0:68 at the same time. This is for example what dhclient wants to do. So even when running dhclient on another, unrelated interface, it would fail to bind the UDP socket and quit. Note that also systemd-networkd's DHCPv4 client sets this socket option. Presumably for the same reasons. Signed-off-by: Thomas Haller https://github.com/nettools/n-dhcp4/pull/12 --- shared/n-dhcp4/src/n-dhcp4-socket.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shared/n-dhcp4/src/n-dhcp4-socket.c b/shared/n-dhcp4/src/n-dhcp4-socket.c index b9ac176fd7..c7e897726e 100644 --- a/shared/n-dhcp4/src/n-dhcp4-socket.c +++ b/shared/n-dhcp4/src/n-dhcp4-socket.c @@ -195,6 +195,10 @@ int n_dhcp4_c_socket_udp_new(int *sockfdp, if (sockfd < 0) return -errno; + r = setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); + if (r < 0) + return -errno; + r = setsockopt(sockfd, SOL_SOCKET, SO_ATTACH_FILTER, &fprog, sizeof(fprog)); if (r < 0) return -errno; From ce1f9e6eb9e4aa72e9954d58d20ca11634f6fd92 Mon Sep 17 00:00:00 2001 From: Alexey Kodanev Date: Tue, 3 Dec 2019 19:00:42 +0300 Subject: [PATCH 071/109] nm-manager: fix selinux label for dhclient lease file from initramfs When moving a lease file from initramfs directory to NetworkManager run directory, SELinux label for that file retains tmpfs_t type. Fix it by using sendfile() instead of rename(). That way, the lease file will have the default type: NetworkManager_var_run_t. Since we take ownership of the lease file, also drop it from the old location. * Before the patch: ls -Z /var/run/NetworkManager/dhclient-*.lease system_u:object_r:tmpfs_t:s0 dhclient-13162c00-abfb-4e28-bbfb-170187ddd044-ens3.lease * After: ls -Z /var/run/NetworkManager/dhclient-*.lease system_u:object_r:NetworkManager_var_run_t:s0 dhclient-f47d1908-67ae-49c6-bd5e-19a690d85526-ens3.lease Fixes: f2fe6c03ee3f ('manager: don't treat the initramfs-configured DHCP connections as generated') https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/353 --- src/nm-manager.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/src/nm-manager.c b/src/nm-manager.c index 808c6538cf..493c665792 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -11,6 +11,10 @@ #include #include #include +#include +#include +#include +#include #include "nm-glib-aux/nm-c-list.h" @@ -2691,6 +2695,31 @@ get_existing_connection (NMManager *self, return added; } +static gboolean +copy_lease (const char *src, const char *dst) +{ + int src_fd, dst_fd; + ssize_t res, size = SSIZE_MAX; + + src_fd = open (src, O_RDONLY|O_CLOEXEC); + if (src_fd < 0) + return FALSE; + + dst_fd = open (dst, O_CREAT|O_EXCL|O_CLOEXEC|O_WRONLY, 0644); + if (dst_fd < 0) { + close (src_fd); + return FALSE; + } + + while ((res = sendfile (dst_fd, src_fd, NULL, size)) > 0) + size -= res; + + close (src_fd); + close (dst_fd); + + return !res; +} + static gboolean recheck_assume_connection (NMManager *self, NMDevice *device) @@ -2732,7 +2761,8 @@ recheck_assume_connection (NMManager *self, nm_settings_connection_get_uuid (sett_conn), nm_device_get_iface (device)); - if (rename (initramfs_lease, connection_lease) == 0) { + if (copy_lease (initramfs_lease, connection_lease)) { + unlink (initramfs_lease); /* * We've managed to steal the lease used by initramfs before it * killed off the dhclient. We need to take ownership of the configured From 0c6cd07ec81d1bd5584549bef72c30adc8c79c9f Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 10 Dec 2019 14:58:29 +0100 Subject: [PATCH 072/109] nm-manager: remove lease file if copying dhclient lease fails - also use nm_auto_close and nm_close(). --- src/nm-manager.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/nm-manager.c b/src/nm-manager.c index 493c665792..a900acbcd4 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -2698,26 +2698,29 @@ get_existing_connection (NMManager *self, static gboolean copy_lease (const char *src, const char *dst) { - int src_fd, dst_fd; - ssize_t res, size = SSIZE_MAX; + nm_auto_close int src_fd = -1; + int dst_fd; + ssize_t res; src_fd = open (src, O_RDONLY|O_CLOEXEC); if (src_fd < 0) return FALSE; dst_fd = open (dst, O_CREAT|O_EXCL|O_CLOEXEC|O_WRONLY, 0644); - if (dst_fd < 0) { - close (src_fd); + if (dst_fd < 0) + return FALSE; + + while ((res = sendfile (dst_fd, src_fd, NULL, G_MAXSSIZE)) > 0) { + } + + nm_close (dst_fd); + + if (res != 0) { + unlink (dst); return FALSE; } - while ((res = sendfile (dst_fd, src_fd, NULL, size)) > 0) - size -= res; - - close (src_fd); - close (dst_fd); - - return !res; + return TRUE; } static gboolean From c21c6bc0be2a4467402bc2d8718859dedb10b676 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 10 Dec 2019 10:01:24 +0100 Subject: [PATCH 073/109] build/meson: allow configuring default for main.auth-polkit setting We always build PolicyKit support, because it merely depends on some D-Bus calls. However, there are two things to configure: - the default value for main.auth-polkit in NetworkManager.conf. This is now called "-Dconfig_auth_polkit_default=$VAL". - whether to install the policy file. This is called "-Dpolkit=$VAL". These settings are mostly independent, so add "config_auth_polkit_default" to make the default explicitly configurable. --- contrib/fedora/rpm/NetworkManager.spec | 1 + meson.build | 14 ++++++++------ meson_options.txt | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index d4a802f74c..d7e3612dc4 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -585,6 +585,7 @@ This tool is still experimental. %endif -Dselinux=true \ -Dpolkit=true \ + -Dconfig_auth_polkit_default=true \ -Dpolkit_agent=true \ -Dmodify_system=true \ -Dconcheck=true \ diff --git a/meson.build b/meson.build index 495529ec9a..022a90fec1 100644 --- a/meson.build +++ b/meson.build @@ -464,8 +464,11 @@ if enable_polkit polkit_gobject_policydir = dependency('polkit-gobject-1').get_pkgconfig_variable('policydir', define_variable: ['prefix', nm_prefix]) endif -config_default_main_auth_polkit = enable_polkit.to_string() -config_h.set_quoted('NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT', config_default_main_auth_polkit) +config_auth_polkit_default = get_option('config_auth_polkit_default') +if config_auth_polkit_default == 'default' + config_auth_polkit_default = (enable_polkit ? 'true' : 'false') +endif +config_h.set_quoted('NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT', config_auth_polkit_default) enable_modify_system = get_option('modify_system') @@ -784,7 +787,7 @@ data_conf = configuration_data() data_conf.set('DISTRO_NETWORK_SERVICE', (enable_ifcfg_rh ? 'network.service' : '')) data_conf.set('NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT', config_default_logging_audit) data_conf.set('NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT', config_logging_backend_default) -data_conf.set('NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT', config_default_main_auth_polkit) +data_conf.set('NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT', config_auth_polkit_default) data_conf.set('NM_CONFIG_DEFAULT_MAIN_DHCP', config_dhcp_default) data_conf.set('NM_CONFIG_DEFAULT_MAIN_RC_MANAGER', config_dns_rc_manager_default) data_conf.set('NM_MAJOR_VERSION', nm_major_version) @@ -935,10 +938,9 @@ output += ' nmplugindir: ' + nm_plugindir + '\n' output += '\nPlatform:\n' output += ' session tracking: ' + ','.join(session_trackers) + '\n' output += ' suspend/resume: ' + suspend_resume + '\n' -output += ' policykit: ' + enable_polkit.to_string() +output += ' policykit: ' + enable_polkit.to_string() + ' (default: ' + config_auth_polkit_default + ')' if enable_polkit - modify = (enable_modify_system ? 'permissive' : 'restrictive') - output += ' (' + modify + ' modify.system) (default: main.auth-polkit=true)' + output += ' (' + (enable_modify_system ? 'permissive' : 'restrictive') + ' modify.system)' endif output += '\n' output += ' polkit agent: ' + enable_polkit_agent.to_string() + '\n' diff --git a/meson_options.txt b/meson_options.txt index ffe2faa8de..4f4f0d5c5a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -14,6 +14,7 @@ option('session_tracking_consolekit', type: 'boolean', value: true, description: option('session_tracking', type: 'combo', choices: ['systemd', 'elogind', 'no'], value: 'systemd', description: 'Compatibility option to choose one session tracking module') option('suspend_resume', type: 'combo', choices: ['upower', 'systemd', 'elogind', 'consolekit', 'auto'], value: 'auto', description: 'Build NetworkManager with specific suspend/resume support') option('polkit', type: 'boolean', value: true, description: 'User auth-polkit configuration option.') +option('config_auth_polkit_default', type: 'combo', choices: ['default', 'true', 'false'], value: 'default', description: 'Default value for configuration main.auth-polkit.') option('modify_system', type: 'boolean', value: false, description: 'Allow users to modify system connections') option('polkit_agent', type: 'boolean', value: false, description: 'enable polkit agent for clients') option('selinux', type: 'boolean', value: true, description: 'Build with SELinux') From 6d7446e52f5bfe379c2b1f54f9244b33fd236e32 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 10 Dec 2019 08:51:03 +0100 Subject: [PATCH 074/109] core: add main.auth-polkit option "root-only" We always build with PolicyKit support enabled, because it has no additional dependencies, beside some D-Bus calls. However, in NetworkManager.conf the user could configure "main.auth-polkit" to disable PolicyKit. However, previously it would only allow to disable PolicyKit while granting access to all users. I think it's useful to have an option that disables PolicyKit and grants access only to root. I think we should not go too far in implementing our own authorization mechanisms beside PolicyKit (e.g. you cannot disable PolicyKit and grant access based on group membership of the user). However, disabling PolicyKit can be useful sometimes, and it's simple to implement a "root-only" setup. Note one change is that when NetworkManager now runs without a D-Bus connection (in initrd), it would deny all non-root requests. Previously it would grant access. I think there should be little difference in practice, because if we have no D-Bus we also don't have any requests to authenticate. --- configure.ac | 12 ++++---- man/NetworkManager.conf.xml | 7 +++-- meson_options.txt | 2 +- src/main.c | 5 +-- src/nm-auth-manager.c | 61 ++++++++++++++++++++++++------------- src/nm-auth-manager.h | 3 +- src/nm-config-data.c | 46 ++++++++++++++++++++++++++++ src/nm-config-data.h | 24 +++++++++++++++ src/nm-config.h | 1 - 9 files changed, 125 insertions(+), 36 deletions(-) diff --git a/configure.ac b/configure.ac index 70d8ff29cb..44bf51a11f 100644 --- a/configure.ac +++ b/configure.ac @@ -614,18 +614,18 @@ AM_CONDITIONAL(WITH_JSON_VALIDATION, test "${enable_json_validation}" != "no") # default configuration for main.auth-polkit. User can always enable/disable polkit # authorization via config. AC_ARG_ENABLE(polkit, - AS_HELP_STRING([--enable-polkit=yes|no], + AS_HELP_STRING([--enable-polkit=yes|no|root-only], [set default value for auth-polkit configuration option. This value can be overwritten by NM configuration. 'disabled' is an alias for 'no']), [enable_polkit=${enableval}], [enable_polkit=yes]) -if (test "${enable_polkit}" != "no" -a "${enable_polkit}" != "disabled"); then +if test "${enable_polkit}" == "root-only" ; then + enable_polkit='root-only' +elif test "${enable_polkit}" != "no" -a "${enable_polkit}" != "disabled" ; then enable_polkit=true - AC_DEFINE(NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT, "true", [The default value of the auth-polkit configuration option]) - AC_SUBST(NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT, true) else enable_polkit=false - AC_DEFINE(NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT, "false", [The default value of the auth-polkit configuration option]) - AC_SUBST(NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT, false) fi +AC_DEFINE_UNQUOTED(NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT, "$enable_polkit", [The default value of the auth-polkit configuration option]) +AC_SUBST(NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT, "$enable_polkit") PKG_CHECK_MODULES(POLKIT, [polkit-agent-1 >= 0.97], [have_pk_agent=yes],[have_pk_agent=no]) AC_ARG_ENABLE(polkit-agent, diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index c213d342b6..6d78ab161c 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -158,8 +158,11 @@ plugins-=remove-me auth-polkit Whether the system uses PolicyKit for authorization. - If false, all requests will be allowed. If - true, non-root requests are authorized using PolicyKit. + If true, non-root requests are authorized using PolicyKit. + Requests from root (user ID zero) are always granted without asking PolicyKit. + If false, all requests will be allowed and PolicyKit is + not used. If set to root-only PolicyKit is not used and + all requests except root are denied. The default value is &NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT;. diff --git a/meson_options.txt b/meson_options.txt index 4f4f0d5c5a..041d9bfc38 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -14,7 +14,7 @@ option('session_tracking_consolekit', type: 'boolean', value: true, description: option('session_tracking', type: 'combo', choices: ['systemd', 'elogind', 'no'], value: 'systemd', description: 'Compatibility option to choose one session tracking module') option('suspend_resume', type: 'combo', choices: ['upower', 'systemd', 'elogind', 'consolekit', 'auto'], value: 'auto', description: 'Build NetworkManager with specific suspend/resume support') option('polkit', type: 'boolean', value: true, description: 'User auth-polkit configuration option.') -option('config_auth_polkit_default', type: 'combo', choices: ['default', 'true', 'false'], value: 'default', description: 'Default value for configuration main.auth-polkit.') +option('config_auth_polkit_default', type: 'combo', choices: ['default', 'true', 'false', 'root-only'], value: 'default', description: 'Default value for configuration main.auth-polkit.') option('modify_system', type: 'boolean', value: false, description: 'Allow users to modify system connections') option('polkit_agent', type: 'boolean', value: false, description: 'enable polkit agent for clients') option('selinux', type: 'boolean', value: true, description: 'Build with SELinux') diff --git a/src/main.c b/src/main.c index 24157b18c6..b1466c1852 100644 --- a/src/main.c +++ b/src/main.c @@ -410,10 +410,7 @@ main (int argc, char *argv[]) NM_UTILS_KEEP_ALIVE (config, nm_netns_get (), "NMConfig-depends-on-NMNetns"); - nm_auth_manager_setup (nm_config_data_get_value_boolean (nm_config_get_data_orig (config), - NM_CONFIG_KEYFILE_GROUP_MAIN, - NM_CONFIG_KEYFILE_KEY_MAIN_AUTH_POLKIT, - NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_BOOL)); + nm_auth_manager_setup (nm_config_data_get_main_auth_polkit (nm_config_get_data_orig (config))); manager = nm_manager_setup (); diff --git a/src/nm-auth-manager.c b/src/nm-auth-manager.c index 244342c035..3f248aeeec 100644 --- a/src/nm-auth-manager.c +++ b/src/nm-auth-manager.c @@ -42,7 +42,7 @@ typedef struct { guint changed_signal_id; bool disposing:1; bool shutting_down:1; - bool polkit_enabled_construct_only:1; + NMAuthPolkitMode auth_polkit_mode:3; } NMAuthManagerPrivate; struct _NMAuthManager { @@ -118,6 +118,7 @@ struct _NMAuthManagerCallId { gpointer user_data; guint64 call_numid; guint idle_id; + bool idle_is_authorized:1; }; #define cancellation_id_to_str_a(call_numid) \ @@ -256,9 +257,10 @@ static gboolean _call_on_idle (gpointer user_data) { NMAuthManagerCallId *call_id = user_data; - gboolean is_authorized = TRUE; + gboolean is_authorized; gboolean is_challenge = FALSE; + is_authorized = call_id->idle_is_authorized; call_id->idle_id = 0; _LOG2T (call_id, "completed: authorized=%d, challenge=%d (simulated)", @@ -312,22 +314,25 @@ nm_auth_manager_check_authorization (NMAuthManager *self, call_id = g_slice_new (NMAuthManagerCallId); *call_id = (NMAuthManagerCallId) { - .self = g_object_ref (self), - .callback = callback, - .user_data = user_data, - .call_numid = ++priv->call_numid_counter, + .self = g_object_ref (self), + .callback = callback, + .user_data = user_data, + .call_numid = ++priv->call_numid_counter, + .idle_is_authorized = TRUE, }; c_list_link_tail (&priv->calls_lst_head, &call_id->calls_lst); - if (!priv->dbus_connection) { - _LOG2T (call_id, "CheckAuthorization(%s), subject=%s (succeeding due to polkit authorization disabled)", action_id, nm_auth_subject_to_string (subject, subject_buf, sizeof (subject_buf))); - call_id->idle_id = g_idle_add (_call_on_idle, call_id); - } else if (nm_auth_subject_is_internal (subject)) { + if (nm_auth_subject_is_internal (subject)) { _LOG2T (call_id, "CheckAuthorization(%s), subject=%s (succeeding for internal request)", action_id, nm_auth_subject_to_string (subject, subject_buf, sizeof (subject_buf))); call_id->idle_id = g_idle_add (_call_on_idle, call_id); } else if (nm_auth_subject_get_unix_process_uid (subject) == 0) { _LOG2T (call_id, "CheckAuthorization(%s), subject=%s (succeeding for root)", action_id, nm_auth_subject_to_string (subject, subject_buf, sizeof (subject_buf))); call_id->idle_id = g_idle_add (_call_on_idle, call_id); + } else if (priv->auth_polkit_mode != NM_AUTH_POLKIT_MODE_USE_POLKIT) { + _LOG2T (call_id, "CheckAuthorization(%s), subject=%s (PolicyKit disabled and always %s authorization to non-root user)", action_id, nm_auth_subject_to_string (subject, subject_buf, sizeof (subject_buf)), + priv->auth_polkit_mode == NM_AUTH_POLKIT_MODE_ALLOW_ALL ? "grant" : "deny"); + call_id->idle_is_authorized = (priv->auth_polkit_mode == NM_AUTH_POLKIT_MODE_ALLOW_ALL); + call_id->idle_id = g_idle_add (_call_on_idle, call_id); } else { GVariant *parameters; GVariantBuilder builder; @@ -461,11 +466,17 @@ static void set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { NMAuthManagerPrivate *priv = NM_AUTH_MANAGER_GET_PRIVATE ((NMAuthManager *) object); + int v_int; switch (prop_id) { case PROP_POLKIT_ENABLED: /* construct-only */ - priv->polkit_enabled_construct_only = !!g_value_get_boolean (value); + v_int = g_value_get_int (value); + g_return_if_fail (NM_IN_SET (v_int, NM_AUTH_POLKIT_MODE_ROOT_ONLY, + NM_AUTH_POLKIT_MODE_ALLOW_ALL, + NM_AUTH_POLKIT_MODE_USE_POLKIT)); + priv->auth_polkit_mode = v_int; + nm_assert (priv->auth_polkit_mode == v_int); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -481,6 +492,7 @@ nm_auth_manager_init (NMAuthManager *self) NMAuthManagerPrivate *priv = NM_AUTH_MANAGER_GET_PRIVATE (self); c_list_init (&priv->calls_lst_head); + priv->auth_polkit_mode = NM_AUTH_POLKIT_MODE_ROOT_ONLY; } static void @@ -493,8 +505,11 @@ constructed (GObject *object) G_OBJECT_CLASS (nm_auth_manager_parent_class)->constructed (object); - if (!priv->polkit_enabled_construct_only) { - create_message = "polkit disabled"; + if (priv->auth_polkit_mode != NM_AUTH_POLKIT_MODE_USE_POLKIT) { + if (priv->auth_polkit_mode == NM_AUTH_POLKIT_MODE_ROOT_ONLY) + create_message = "polkit disabled, root-only"; + else + create_message = "polkit disabled, allow-all"; goto out; } @@ -503,7 +518,8 @@ constructed (GObject *object) if (!priv->dbus_connection) { /* This warrants an info level message. */ logl = LOGL_INFO; - create_message = "D-Bus connection not available. Polkit is disabled and all requests are authenticated."; + create_message = "D-Bus connection not available. Polkit is disabled and only root will be authorized."; + priv->auth_polkit_mode = NM_AUTH_POLKIT_MODE_ROOT_ONLY; goto out; } @@ -527,14 +543,17 @@ out: } NMAuthManager * -nm_auth_manager_setup (gboolean polkit_enabled) +nm_auth_manager_setup (NMAuthPolkitMode auth_polkit_mode) { NMAuthManager *self; g_return_val_if_fail (!singleton_instance, singleton_instance); + nm_assert (NM_IN_SET (auth_polkit_mode, NM_AUTH_POLKIT_MODE_ROOT_ONLY, + NM_AUTH_POLKIT_MODE_ALLOW_ALL, + NM_AUTH_POLKIT_MODE_USE_POLKIT)); self = g_object_new (NM_TYPE_AUTH_MANAGER, - NM_AUTH_MANAGER_POLKIT_ENABLED, polkit_enabled, + NM_AUTH_MANAGER_POLKIT_ENABLED, (int) auth_polkit_mode, NULL); _LOGD ("set instance"); @@ -579,11 +598,11 @@ nm_auth_manager_class_init (NMAuthManagerClass *klass) object_class->dispose = dispose; obj_properties[PROP_POLKIT_ENABLED] = - g_param_spec_boolean (NM_AUTH_MANAGER_POLKIT_ENABLED, "", "", - FALSE, - G_PARAM_WRITABLE | - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_STRINGS); + g_param_spec_int (NM_AUTH_MANAGER_POLKIT_ENABLED, "", "", + NM_AUTH_POLKIT_MODE_ROOT_ONLY, NM_AUTH_POLKIT_MODE_USE_POLKIT, NM_AUTH_POLKIT_MODE_USE_POLKIT, + G_PARAM_WRITABLE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS); g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties); diff --git a/src/nm-auth-manager.h b/src/nm-auth-manager.h index 3e3124cacb..ab924e69a5 100644 --- a/src/nm-auth-manager.h +++ b/src/nm-auth-manager.h @@ -7,6 +7,7 @@ #define NM_AUTH_MANAGER_H #include "nm-auth-subject.h" +#include "nm-config-data.h" /*****************************************************************************/ @@ -55,7 +56,7 @@ typedef struct _NMAuthManagerClass NMAuthManagerClass; GType nm_auth_manager_get_type (void); -NMAuthManager *nm_auth_manager_setup (gboolean polkit_enabled); +NMAuthManager *nm_auth_manager_setup (NMAuthPolkitMode auth_polkit_mode); NMAuthManager *nm_auth_manager_get (void); void nm_auth_manager_force_shutdown (NMAuthManager *self); diff --git a/src/nm-config-data.c b/src/nm-config-data.c index b5868b7b1a..8f53304aa6 100644 --- a/src/nm-config-data.c +++ b/src/nm-config-data.c @@ -386,6 +386,52 @@ _nm_config_data_get_keyfile_user (const NMConfigData *self) /*****************************************************************************/ +static NMAuthPolkitMode +nm_auth_polkit_mode_from_string (const char *str) +{ + int as_bool; + + if (!str) + return NM_AUTH_POLKIT_MODE_UNKNOWN; + + if (nm_streq (str, "root-only")) + return NM_AUTH_POLKIT_MODE_ROOT_ONLY; + + as_bool = _nm_utils_ascii_str_to_bool (str, -1); + if (as_bool != -1) { + return as_bool + ? NM_AUTH_POLKIT_MODE_USE_POLKIT + : NM_AUTH_POLKIT_MODE_ALLOW_ALL; + } + + return NM_AUTH_POLKIT_MODE_UNKNOWN; +} + +NMAuthPolkitMode +nm_config_data_get_main_auth_polkit (const NMConfigData *self) +{ + NMAuthPolkitMode auth_polkit_mode; + const char *str; + + str = nm_config_data_get_value (self, + NM_CONFIG_KEYFILE_GROUP_MAIN, + NM_CONFIG_KEYFILE_KEY_MAIN_AUTH_POLKIT, + NM_CONFIG_GET_VALUE_STRIP + | NM_CONFIG_GET_VALUE_NO_EMPTY); + auth_polkit_mode = nm_auth_polkit_mode_from_string (str); + if (auth_polkit_mode == NM_AUTH_POLKIT_MODE_UNKNOWN) { + auth_polkit_mode = nm_auth_polkit_mode_from_string (NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT); + if (auth_polkit_mode == NM_AUTH_POLKIT_MODE_UNKNOWN) { + nm_assert_not_reached (); + auth_polkit_mode = NM_AUTH_POLKIT_MODE_ROOT_ONLY; + } + } + + return auth_polkit_mode; +} + +/*****************************************************************************/ + /** * nm_config_data_get_groups: * @self: the #NMConfigData instance diff --git a/src/nm-config-data.h b/src/nm-config-data.h index a6f03902d5..f83ab92874 100644 --- a/src/nm-config-data.h +++ b/src/nm-config-data.h @@ -6,6 +6,28 @@ #ifndef NM_CONFIG_DATA_H #define NM_CONFIG_DATA_H +/*****************************************************************************/ + +typedef enum { + + /* an invalid mode. */ + NM_AUTH_POLKIT_MODE_UNKNOWN, + + /* don't use PolicyKit, but only allow root user (uid 0). */ + NM_AUTH_POLKIT_MODE_ROOT_ONLY, + + /* don't use PolicyKit, but allow all requests. */ + NM_AUTH_POLKIT_MODE_ALLOW_ALL, + + /* use PolicyKit to authorize requests. Root user (uid 0) always + * gets a free pass, without consulting PolicyKit. If PolicyKit is not + * running, authorization will fail for non root users. */ + NM_AUTH_POLKIT_MODE_USE_POLKIT, + +} NMAuthPolkitMode; + +/*****************************************************************************/ + #define NM_TYPE_CONFIG_DATA (nm_config_data_get_type ()) #define NM_CONFIG_DATA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_CONFIG_DATA, NMConfigData)) #define NM_CONFIG_DATA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_CONFIG_DATA, NMConfigDataClass)) @@ -132,6 +154,8 @@ const char *nm_config_data_get_connectivity_response (const NMConfigData *config int nm_config_data_get_autoconnect_retries_default (const NMConfigData *config_data); +NMAuthPolkitMode nm_config_data_get_main_auth_polkit (const NMConfigData *config_data); + const char *const*nm_config_data_get_no_auto_default (const NMConfigData *config_data); gboolean nm_config_data_get_no_auto_default_for_device (const NMConfigData *self, NMDevice *device); diff --git a/src/nm-config.h b/src/nm-config.h index e3e658c702..d9460ebb46 100644 --- a/src/nm-config.h +++ b/src/nm-config.h @@ -219,7 +219,6 @@ extern char *_nm_config_match_env; #define NM_CONFIG_DEVICE_STATE_DIR ""NMRUNDIR"/devices" -#define NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_BOOL (nm_streq (""NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT, "true")) #define NM_CONFIG_DEFAULT_LOGGING_AUDIT_BOOL (nm_streq (""NM_CONFIG_DEFAULT_LOGGING_AUDIT, "true")) typedef enum { From 6998c5f129f70d676698de07667d6ee0334839ce Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 10 Dec 2019 08:44:07 +0100 Subject: [PATCH 075/109] config: return GPtrArray with warnings from internal read_entire_config() function The underlying GPtrArray that we use to construct the list of warnings is more useful than the strv array. For the internal function, don't let it return the strv array but instead take (and fill) the warnings as GPtrArray. There is no difference in practice, because also previously we would always create an empty GPtrArray. --- src/nm-config.c | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/src/nm-config.c b/src/nm-config.c index 9da2fe0a48..7d5be95c61 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -1210,7 +1210,7 @@ read_entire_config (const NMConfigCmdLineOptions *cli, const char *system_config_dir, char **out_config_main_file, char **out_config_description, - char ***out_warnings, + GPtrArray *warnings, GError **error) { gs_unref_keyfile GKeyFile *keyfile = NULL; @@ -1220,14 +1220,13 @@ read_entire_config (const NMConfigCmdLineOptions *cli, guint i; gs_free char *o_config_main_file = NULL; const char *run_config_dir = ""; - gs_unref_ptrarray GPtrArray *warnings = NULL; - g_return_val_if_fail (config_dir, NULL); - g_return_val_if_fail (system_config_dir, NULL); - g_return_val_if_fail (!out_config_main_file || !*out_config_main_file, FALSE); - g_return_val_if_fail (!out_config_description || !*out_config_description, NULL); - g_return_val_if_fail (!error || !*error, FALSE); - g_return_val_if_fail (out_warnings && !*out_warnings, FALSE); + nm_assert (config_dir); + nm_assert (system_config_dir); + nm_assert (!out_config_main_file || !*out_config_main_file); + nm_assert (!out_config_description || !*out_config_description); + nm_assert (!error || !*error); + nm_assert (warnings); if ( (""RUN_CONFIG_DIR)[0] == '/' && !nm_streq (RUN_CONFIG_DIR, system_config_dir) @@ -1236,7 +1235,6 @@ read_entire_config (const NMConfigCmdLineOptions *cli, /* create a default configuration file. */ keyfile = nm_config_create_keyfile (); - warnings = g_ptr_array_new_with_free_func (g_free); system_confs = _get_config_dir_files (system_config_dir); confs = _get_config_dir_files (config_dir); @@ -1326,10 +1324,6 @@ read_entire_config (const NMConfigCmdLineOptions *cli, } NM_SET_OUT (out_config_main_file, g_steal_pointer (&o_config_main_file)); - g_ptr_array_add (warnings, NULL); - *out_warnings = (char **) g_ptr_array_free (warnings, warnings->len == 1); - g_steal_pointer (&warnings); - return g_steal_pointer (&keyfile); } @@ -2572,7 +2566,7 @@ nm_config_reload (NMConfig *self, NMConfigChangeFlags reload_flags, gboolean emi char *config_description = NULL; gs_strfreev char **no_auto_default = NULL; gboolean intern_config_needs_rewrite; - gs_strfreev char **warnings = NULL; + gs_unref_ptrarray GPtrArray *warnings = NULL; guint i; g_return_if_fail (NM_IS_CONFIG (self)); @@ -2589,6 +2583,8 @@ nm_config_reload (NMConfig *self, NMConfigChangeFlags reload_flags, gboolean emi return; } + warnings = g_ptr_array_new_with_free_func (g_free); + /* pass on the original command line options. This means, that * options specified at command line cannot ever be reloaded from * file. That seems desirable. @@ -2598,7 +2594,7 @@ nm_config_reload (NMConfig *self, NMConfigChangeFlags reload_flags, gboolean emi priv->system_config_dir, &config_main_file, &config_description, - &warnings, + warnings, &error); if (!keyfile) { _LOGE ("Failed to reload the configuration: %s", error->message); @@ -2607,9 +2603,9 @@ nm_config_reload (NMConfig *self, NMConfigChangeFlags reload_flags, gboolean emi return; } - if (emit_warnings && warnings) { - for (i = 0; warnings[i]; i++) - _LOGW ("%s", warnings[i]); + if (emit_warnings) { + for (i = 0; i < warnings->len; i++) + _LOGW ("%s", (const char *) warnings->pdata[i]); } no_auto_default = no_auto_default_from_file (priv->no_auto_default_file); @@ -2779,7 +2775,7 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error) gs_free char *config_main_file = NULL; gs_free char *config_description = NULL; gs_strfreev char **no_auto_default = NULL; - gs_strfreev char **warnings = NULL; + gs_unref_ptrarray GPtrArray *warnings = NULL; gs_free char *configure_and_quit = NULL; gboolean intern_config_needs_rewrite; const char *s; @@ -2806,12 +2802,14 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error) else priv->intern_config_file = g_strdup (DEFAULT_INTERN_CONFIG_FILE); + warnings = g_ptr_array_new_with_free_func (g_free); + keyfile = read_entire_config (&priv->cli, priv->config_dir, priv->system_config_dir, &config_main_file, &config_description, - &warnings, + warnings, error); if (!keyfile) return FALSE; @@ -2858,7 +2856,10 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error) keyfile_intern); priv->config_data = g_object_ref (priv->config_data_orig); - priv->warnings = g_steal_pointer (&warnings); + if (warnings->len > 0) { + g_ptr_array_add (warnings, NULL); + priv->warnings = (char **) g_ptr_array_free (g_steal_pointer (&warnings), FALSE); + } return TRUE; } From 8d20b9363b4461c7e86f2310a2fbfe88a09d5284 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 11 Dec 2019 11:35:11 +0100 Subject: [PATCH 076/109] config: add nm_config_data_get_warnings() to get additional warnings about wrong configuration No additional warnings are implemented yet. --- src/nm-config-data.c | 8 ++++++++ src/nm-config-data.h | 3 +++ src/nm-config.c | 14 +++++++++----- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/nm-config-data.c b/src/nm-config-data.c index 8f53304aa6..d8146457a3 100644 --- a/src/nm-config-data.c +++ b/src/nm-config-data.c @@ -1598,6 +1598,14 @@ nm_config_data_diff (NMConfigData *old_data, NMConfigData *new_data) /*****************************************************************************/ +void +nm_config_data_get_warnings (const NMConfigData *self, + GPtrArray *warnings) +{ +} + +/*****************************************************************************/ + static void get_property (GObject *object, guint prop_id, diff --git a/src/nm-config-data.h b/src/nm-config-data.h index f83ab92874..2a3f2a89eb 100644 --- a/src/nm-config-data.h +++ b/src/nm-config-data.h @@ -234,6 +234,9 @@ void nm_global_dns_config_free (NMGlobalDnsConfig *dns_config); NMGlobalDnsConfig *nm_global_dns_config_from_dbus (const GValue *value, GError **error); void nm_global_dns_config_to_dbus (const NMGlobalDnsConfig *dns_config, GValue *value); +void nm_config_data_get_warnings (const NMConfigData *self, + GPtrArray *warnings); + /* private accessors */ GKeyFile *_nm_config_data_get_keyfile (const NMConfigData *self); GKeyFile *_nm_config_data_get_keyfile_user (const NMConfigData *self); diff --git a/src/nm-config.c b/src/nm-config.c index 7d5be95c61..a7bb350302 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -2603,11 +2603,6 @@ nm_config_reload (NMConfig *self, NMConfigChangeFlags reload_flags, gboolean emi return; } - if (emit_warnings) { - for (i = 0; i < warnings->len; i++) - _LOGW ("%s", (const char *) warnings->pdata[i]); - } - no_auto_default = no_auto_default_from_file (priv->no_auto_default_file); keyfile_intern = intern_config_read (priv->intern_config_file, @@ -2624,6 +2619,13 @@ nm_config_reload (NMConfig *self, NMConfigChangeFlags reload_flags, gboolean emi (const char *const*) no_auto_default, keyfile, keyfile_intern); + + if (emit_warnings) { + nm_config_data_get_warnings (priv->config_data_orig, warnings); + for (i = 0; i < warnings->len; i++) + _LOGW ("%s", (const char *) warnings->pdata[i]); + } + g_free (config_main_file); g_free (config_description); g_key_file_unref (keyfile); @@ -2855,6 +2857,8 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error) keyfile, keyfile_intern); + nm_config_data_get_warnings (priv->config_data_orig, warnings); + priv->config_data = g_object_ref (priv->config_data_orig); if (warnings->len > 0) { g_ptr_array_add (warnings, NULL); From 8f96d3cb0c40ef19ab6524a39eeae9b03da1b4f3 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 11 Dec 2019 11:40:22 +0100 Subject: [PATCH 077/109] config: emit warning about invalid main.auth-polkit setting --- src/nm-config-data.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/src/nm-config-data.c b/src/nm-config-data.c index d8146457a3..c787aa98ac 100644 --- a/src/nm-config-data.c +++ b/src/nm-config-data.c @@ -407,8 +407,9 @@ nm_auth_polkit_mode_from_string (const char *str) return NM_AUTH_POLKIT_MODE_UNKNOWN; } -NMAuthPolkitMode -nm_config_data_get_main_auth_polkit (const NMConfigData *self) +static NMAuthPolkitMode +_config_data_get_main_auth_polkit (const NMConfigData *self, + gboolean *out_invalid_config) { NMAuthPolkitMode auth_polkit_mode; const char *str; @@ -420,16 +421,24 @@ nm_config_data_get_main_auth_polkit (const NMConfigData *self) | NM_CONFIG_GET_VALUE_NO_EMPTY); auth_polkit_mode = nm_auth_polkit_mode_from_string (str); if (auth_polkit_mode == NM_AUTH_POLKIT_MODE_UNKNOWN) { + NM_SET_OUT (out_invalid_config, (str != NULL)); auth_polkit_mode = nm_auth_polkit_mode_from_string (NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT); if (auth_polkit_mode == NM_AUTH_POLKIT_MODE_UNKNOWN) { nm_assert_not_reached (); auth_polkit_mode = NM_AUTH_POLKIT_MODE_ROOT_ONLY; } - } + } else + NM_SET_OUT (out_invalid_config, FALSE); return auth_polkit_mode; } +NMAuthPolkitMode +nm_config_data_get_main_auth_polkit (const NMConfigData *self) +{ + return _config_data_get_main_auth_polkit (self, NULL); +} + /*****************************************************************************/ /** @@ -1602,6 +1611,18 @@ void nm_config_data_get_warnings (const NMConfigData *self, GPtrArray *warnings) { + gboolean invalid; + + nm_assert (NM_IS_CONFIG_DATA (self)); + nm_assert (warnings); + + _config_data_get_main_auth_polkit (self, &invalid); + if (invalid) { + g_ptr_array_add (warnings, + g_strdup_printf ("invalid setting for %s.%s (should be one of \"true\", \"false\", \"root-only\")", + NM_CONFIG_KEYFILE_GROUP_MAIN, + NM_CONFIG_KEYFILE_KEY_MAIN_AUTH_POLKIT)); + } } /*****************************************************************************/ From fd8c8ffe0d674beed69c910b7566cabdea8896ad Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 11 Dec 2019 11:48:25 +0100 Subject: [PATCH 078/109] config: print config warnings during `NetworkManager --print-config` --- src/main.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main.c b/src/main.c index b1466c1852..262b64841f 100644 --- a/src/main.c +++ b/src/main.c @@ -154,6 +154,7 @@ print_config (NMConfigCmdLineOptions *config_cli) gs_unref_object NMConfig *config = NULL; gs_free_error GError *error = NULL; NMConfigData *config_data; + const char *const*warnings; nm_logging_setup ("OFF", "ALL", NULL, NULL); @@ -166,6 +167,13 @@ print_config (NMConfigCmdLineOptions *config_cli) config_data = nm_config_get_data (config); fprintf (stdout, "# NetworkManager configuration: %s\n", nm_config_data_get_config_description (config_data)); nm_config_data_log (config_data, "", "", nm_config_get_no_auto_default_file (config), stdout); + + warnings = nm_config_get_warnings (config); + if (warnings && warnings[0]) + fprintf (stdout, "\n"); + for ( ; warnings && warnings[0]; warnings++) + fprintf (stdout, "# WARNING: %s\n", warnings[0]); + return 0; } From ceeefa82c54fe1e37f9a97ccf98dc9cb8773b0e6 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Thu, 5 Dec 2019 15:39:32 +0100 Subject: [PATCH 079/109] infiniband: allow reapply of MTU --- src/devices/nm-device-infiniband.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c index 24593ff1f5..9f79d9bbf6 100644 --- a/src/devices/nm-device-infiniband.c +++ b/src/devices/nm-device-infiniband.c @@ -190,6 +190,32 @@ update_connection (NMDevice *device, NMConnection *connection) g_object_set (G_OBJECT (s_infiniband), NM_SETTING_INFINIBAND_TRANSPORT_MODE, transport_mode, NULL); } +static gboolean +can_reapply_change (NMDevice *device, + const char *setting_name, + NMSetting *s_old, + NMSetting *s_new, + GHashTable *diffs, + GError **error) +{ + NMDeviceClass *device_class; + + if (nm_streq (setting_name, NM_SETTING_INFINIBAND_SETTING_NAME)) { + return nm_device_hash_check_invalid_keys (diffs, + NM_SETTING_INFINIBAND_SETTING_NAME, + error, + NM_SETTING_INFINIBAND_MTU); /* reapplied with IP config */ + } + + device_class = NM_DEVICE_CLASS (nm_device_infiniband_parent_class); + return device_class->can_reapply_change (device, + setting_name, + s_old, + s_new, + diffs, + error); +} + static gboolean create_and_realize (NMDevice *device, NMConnection *connection, @@ -342,6 +368,7 @@ nm_device_infiniband_class_init (NMDeviceInfinibandClass *klass) device_class->connection_type_check_compatible = NM_SETTING_INFINIBAND_SETTING_NAME; device_class->link_types = NM_DEVICE_DEFINE_LINK_TYPES (NM_LINK_TYPE_INFINIBAND); + device_class->can_reapply_change = can_reapply_change; device_class->create_and_realize = create_and_realize; device_class->unrealize = unrealize; device_class->get_generic_capabilities = get_generic_capabilities; From 9339d3310e48e14f58428ec923ed9c653df1693b Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Thu, 5 Dec 2019 15:39:56 +0100 Subject: [PATCH 080/109] device: always allow reapply of MTU from wired setting Many device types take the MTU value from the wired setting; usually they don't implement the can_reapply_change() method and so the MTU can't be changed with the Reapply() API. Instead of implementing the method for all such devices to support the same property (adding a lot of duplicated code), add a check in NMDevice to allow the reapply of MTU when we recognize that the device uses the MTU from the wired setting. Device types can still decide to implement can_reapply_change() and support whatever properties they want, even from the wired setting. --- src/devices/nm-device.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index c50aa42ac7..3b595938df 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -11752,6 +11752,14 @@ can_reapply_change (NMDevice *self, NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP6_CONFIG_SETTING_NAME)) { return TRUE; + } else if ( nm_streq (setting_name, NM_SETTING_WIRED_SETTING_NAME) + && NM_IN_SET (NM_DEVICE_GET_CLASS (self)->get_configured_mtu, + nm_device_get_configured_mtu_wired_parent, + nm_device_get_configured_mtu_for_wired)) { + return nm_device_hash_check_invalid_keys (diffs, + NM_SETTING_WIRED_SETTING_NAME, + error, + NM_SETTING_WIRED_MTU); } else { g_set_error (error, NM_DEVICE_ERROR, From f2dbf8fbc0efd3853100c6e7d7187d649e792793 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Tue, 3 Dec 2019 16:29:15 +0100 Subject: [PATCH 081/109] manager: forbid autoactivation of parent when it is blocked by user request If a device is being autoactivated and requires a parent that is blocked due to user request, the autoactivation attempt should fail because NM shouldn't overrule the user decision. https://bugzilla.redhat.com/show_bug.cgi?id=1765566 --- src/nm-manager.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/nm-manager.c b/src/nm-manager.c index a900acbcd4..3150aefd9a 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -4673,6 +4673,15 @@ _internal_activate_device (NMManager *self, NMActiveConnection *active, GError * return FALSE; } + if ( nm_active_connection_get_activation_reason (active) == NM_ACTIVATION_REASON_AUTOCONNECT + && nm_settings_connection_autoconnect_blocked_reason_get (parent_con, + NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST)) { + g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_DEPENDENCY_FAILED, + "the parent connection of %s cannot autoactivate because it is blocked due to user request", + nm_device_get_iface (device)); + return FALSE; + } + parent_ac = nm_manager_activate_connection (self, parent_con, NULL, From 70ebdc77307d9710673d83e52ea5a13480f8988a Mon Sep 17 00:00:00 2001 From: Alexey Kodanev Date: Wed, 11 Dec 2019 18:55:07 +0300 Subject: [PATCH 082/109] nm-manager: restore passing correct size to sendfile in copy_lease() Otherwise sendfile() fails with EINVAL when the file offset is greater than zero (pos + size > max), always on the second iteration. Fixes: 0c6cd07ec81d ('nm-manager: remove lease file if copying dhclient lease fails') https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/359 --- src/nm-manager.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nm-manager.c b/src/nm-manager.c index 3150aefd9a..b1810474b0 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -2700,7 +2700,7 @@ copy_lease (const char *src, const char *dst) { nm_auto_close int src_fd = -1; int dst_fd; - ssize_t res; + ssize_t res, size = SSIZE_MAX; src_fd = open (src, O_RDONLY|O_CLOEXEC); if (src_fd < 0) @@ -2710,8 +2710,8 @@ copy_lease (const char *src, const char *dst) if (dst_fd < 0) return FALSE; - while ((res = sendfile (dst_fd, src_fd, NULL, G_MAXSSIZE)) > 0) { - } + while ((res = sendfile (dst_fd, src_fd, NULL, size)) > 0) + size -= res; nm_close (dst_fd); From ffc235c30d40ccf375130a638b2c9cc18f5971c5 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 13 Dec 2019 09:32:23 +0100 Subject: [PATCH 083/109] clients/tests: rename "replace_stdout" variable to "replace_uuids" The variable name should say what it is, not what it is used for. E.g. we would use the very same replacements for stderr. Rename so that it can (by its name) used for different purposes. --- clients/tests/test-client.py | 128 +++++++++++++++++------------------ 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index 10739239b8..7daab013b8 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -1027,38 +1027,38 @@ class TestNmcli(NmTestBase): def test_003(self): self.init_001() - replace_stdout = [] + replace_uuids = [] - replace_stdout.append((Util.memoize_nullary(lambda: self.srv.findConnectionUuid('con-xx1')), 'UUID-con-xx1-REPLACED-REPLACED-REPLA')) + replace_uuids.append((Util.memoize_nullary(lambda: self.srv.findConnectionUuid('con-xx1')), 'UUID-con-xx1-REPLACED-REPLACED-REPLA')) self.call_nmcli(['c', 'add', 'type', 'ethernet', 'ifname', '*', 'con-name', 'con-xx1'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(['c', 's'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) - replace_stdout.append((Util.memoize_nullary(lambda: self.srv.findConnectionUuid('con-gsm1')), 'UUID-con-gsm1-REPLACED-REPLACED-REPL')) + replace_uuids.append((Util.memoize_nullary(lambda: self.srv.findConnectionUuid('con-gsm1')), 'UUID-con-gsm1-REPLACED-REPLACED-REPL')) self.call_nmcli(['connection', 'add', 'type', 'gsm', 'autoconnect', 'no', 'con-name', 'con-gsm1', 'ifname', '*', 'apn', 'xyz.con-gsm1', 'serial.baud', '5', 'serial.send-delay', '100', 'serial.pari', '1', 'ipv4.dns-options', ' '], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) - replace_stdout.append((Util.memoize_nullary(lambda: self.srv.findConnectionUuid('ethernet')), 'UUID-ethernet-REPLACED-REPLACED-REPL')) + replace_uuids.append((Util.memoize_nullary(lambda: self.srv.findConnectionUuid('ethernet')), 'UUID-ethernet-REPLACED-REPLACED-REPL')) self.call_nmcli(['c', 'add', 'type', 'ethernet', 'ifname', '*'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(['c', 's'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(['-f', 'ALL', 'c', 's'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(['--complete-args', '-f', 'ALL', 'c', 's', ''], - replace_stdout = replace_stdout, + replace_stdout = replace_uuids, sort_lines_stdout = True) self.call_nmcli_l(['con', 's', 'con-gsm1'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) # activate the same profile on multiple devices. Our stub-implmentation # is fine with that... although NetworkManager service would reject @@ -1074,41 +1074,41 @@ class TestNmcli(NmTestBase): self.call_nmcli(['con', 'up', 'ethernet', 'ifname', dev]) self.call_nmcli_l(['con'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(['-f', 'ALL', 'con'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(['-f', 'ALL', 'con', 's', '-a'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(['-f', 'ACTIVE-PATH,DEVICE,UUID', 'con', 's', '-act'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(['-f', 'UUID,NAME', 'con', 's', '--active'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(['-f', 'ALL', 'con', 's', 'ethernet'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(['-f', 'GENERAL.STATE', 'con', 's', 'ethernet'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(['con', 's', 'ethernet'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(['-f', 'ALL', 'dev', 'status'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) # test invalid call ('s' abbrevates 'status' and not 'show' self.call_nmcli_l(['-f', 'ALL', 'dev', 's', 'eth0'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(['-f', 'ALL', 'dev', 'show', 'eth0'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(['-f', 'ALL', '-t', 'dev', 'show', 'eth0'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.async_wait() @@ -1123,30 +1123,30 @@ class TestNmcli(NmTestBase): for mode in Util.iter_nmcli_output_modes(): self.call_nmcli_l(mode + ['-f', 'ALL', 'con'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['-f', 'UUID,TYPE', 'con'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['con', 's', 'ethernet'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['c', 's', '/org/freedesktop/NetworkManager/ActiveConnection/1'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['-f', 'all', 'dev', 'show', 'eth0'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) @nm_test def test_004(self): self.init_001() - replace_stdout = [] + replace_uuids = [] - replace_stdout.append((Util.memoize_nullary(lambda: self.srv.findConnectionUuid('con-xx1')), 'UUID-con-xx1-REPLACED-REPLACED-REPLA')) + replace_uuids.append((Util.memoize_nullary(lambda: self.srv.findConnectionUuid('con-xx1')), 'UUID-con-xx1-REPLACED-REPLACED-REPLA')) self.call_nmcli(['c', 'add', 'type', 'wifi', 'ifname', '*', 'ssid', 'foobar', 'con-name', 'con-xx1'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli(['connection', 'mod', 'con-xx1', 'ip.gateway', '']) self.call_nmcli(['connection', 'mod', 'con-xx1', 'ipv4.gateway', '172.16.0.1'], lang = 'pl') @@ -1155,29 +1155,29 @@ class TestNmcli(NmTestBase): self.call_nmcli(['connection', 'mod', 'con-xx1', '802-11-wireless.band', 'a']) self.call_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']) self.call_nmcli_l(['con', 's', 'con-xx1'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.async_wait() - replace_stdout.append((Util.memoize_nullary(lambda: self.srv.findConnectionUuid('con-vpn-1')), 'UUID-con-vpn-1-REPLACED-REPLACED-REP')) + replace_uuids.append((Util.memoize_nullary(lambda: self.srv.findConnectionUuid('con-vpn-1')), 'UUID-con-vpn-1-REPLACED-REPLACED-REP')) self.call_nmcli(['connection', 'add', 'type', 'vpn', 'con-name', 'con-vpn-1', 'ifname', '*', 'vpn-type', 'openvpn', 'vpn.data', 'key1 = val1, key2 = val2, key3=val3'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(['con', 's'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(['con', 's', 'con-vpn-1'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli(['con', 'up', 'con-xx1']) self.call_nmcli_l(['con', 's'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli(['con', 'up', 'con-vpn-1']) self.call_nmcli_l(['con', 's'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(['con', 's', 'con-vpn-1'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.async_wait() @@ -1188,72 +1188,72 @@ class TestNmcli(NmTestBase): for mode in Util.iter_nmcli_output_modes(): self.call_nmcli_l(mode + ['con', 's', 'con-vpn-1'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['con', 's', 'con-vpn-1'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['-f', 'ALL', 'con', 's', 'con-vpn-1'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) # This only filters 'vpn' settings from the connection profile. # Contrary to '-f GENERAL' below, it does not show the properties of # the activated VPN connection. This is a nmcli bug. self.call_nmcli_l(mode + ['-f', 'VPN', 'con', 's', 'con-vpn-1'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['-f', 'GENERAL', 'con', 's', 'con-vpn-1'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['dev', 's'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['-f', 'all', 'dev', 'status'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['dev', 'show'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['-f', 'all', 'dev', 'show'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['dev', 'show', 'wlan0'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['-f', 'all', 'dev', 'show', 'wlan0'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['-f', 'GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES', 'dev', 'show', 'wlan0'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['-f', 'GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES', 'dev', 'show', 'wlan0'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['-f', 'DEVICE,TYPE,DBUS-PATH', 'dev'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['-f', 'ALL', 'device', 'wifi', 'list' ], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['-f', 'COMMON', 'device', 'wifi', 'list' ], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['-f', 'NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH', 'device', 'wifi', 'list'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['-f', 'ALL', 'device', 'wifi', 'list', 'bssid', 'C0:E2:BE:E8:EF:B6'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['-f', 'COMMON', 'device', 'wifi', 'list', 'bssid', 'C0:E2:BE:E8:EF:B6'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['-f', 'NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH', 'device', 'wifi', 'list', 'bssid', 'C0:E2:BE:E8:EF:B6'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['-f', 'ALL', 'device', 'show', 'wlan0' ], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['-f', 'COMMON', 'device', 'show', 'wlan0' ], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['-f', 'GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS', 'device', 'show', 'wlan0' ], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) self.call_nmcli_l(mode + ['dev', 'lldp', 'list', 'ifname', 'eth0'], - replace_stdout = replace_stdout) + replace_stdout = replace_uuids) ############################################################################### From 48225add3a1126a144959ecf82452ad6f8252511 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 13 Dec 2019 10:00:38 +0100 Subject: [PATCH 084/109] clients/tests: support string arguments to Util.replace_text() --- clients/tests/test-client.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index 7daab013b8..66743233a4 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -278,6 +278,9 @@ class Util: def replace_text(text, replace_arr): if not replace_arr: return text + needs_encode = Util.python_has_version(3) and Util.is_string(text) + if needs_encode: + text = text.encode('utf-8') text = [text] for replace in replace_arr: try: @@ -301,7 +304,11 @@ class Util: text2.append( (v_replace,) ) text2.append(t3) text = text2 - return b''.join([(t[0] if isinstance(t, tuple) else t) for t in text]) + bb = b''.join([(t[0] if isinstance(t, tuple) else t) for t in text]) + if needs_encode: + bb = bb.decode('utf-8') + return bb + @staticmethod def debug_dbus_interface(): From 52b89cb21ba511a8439dfc88a2be965aecce6c1f Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 13 Dec 2019 10:07:37 +0100 Subject: [PATCH 085/109] clients/tests: fix wrongly constructing command line string as tuple in TestNmcli It had no bad effect, but the cmd was a tuple with one string, and not a string. --- clients/tests/test-client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index 66743233a4..37c3e74908 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -787,7 +787,7 @@ class TestNmcli(NmTestBase): self.assertEqual(returncode, -5) if check_on_disk: - cmd = '$NMCLI %s' % (' '.join([Util.quote(a) for a in args[1:]])), + cmd = '$NMCLI %s' % (' '.join([Util.quote(a) for a in args[1:]])) content = ('location: %s\n' % (calling_location)).encode('utf8') + \ ('cmd: %s\n' % (cmd)).encode('utf8') + \ From 7d048f1a5bb1af6aa8f05ad4a40e84b4da647731 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 13 Dec 2019 10:02:27 +0100 Subject: [PATCH 086/109] clients/tests: support replacing UUIDs in command text We want to issue a nmcli command with the connection's UUID in the command line. As the command line is stored to disk and compared, we cannot use UUIDs that are randomly generated. Instead, we need to support replacing the text in the command line. --- clients/tests/test-client.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index 37c3e74908..03415cd031 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -594,6 +594,7 @@ class TestNmcli(NmTestBase): expected_stderr = _DEFAULT_ARG, replace_stdout = None, replace_stderr = None, + replace_cmd = None, sort_lines_stdout = False, extra_env = None, sync_barrier = False): @@ -608,6 +609,7 @@ class TestNmcli(NmTestBase): expected_stderr, replace_stdout, replace_stderr, + replace_cmd, sort_lines_stdout, extra_env, sync_barrier, @@ -625,6 +627,7 @@ class TestNmcli(NmTestBase): expected_stderr = _DEFAULT_ARG, replace_stdout = None, replace_stderr = None, + replace_cmd = None, sort_lines_stdout = False, extra_env = None, sync_barrier = None): @@ -651,6 +654,7 @@ class TestNmcli(NmTestBase): expected_stderr, replace_stdout, replace_stderr, + replace_cmd, sort_lines_stdout, extra_env, sync_barrier, @@ -666,6 +670,7 @@ class TestNmcli(NmTestBase): expected_stderr, replace_stdout, replace_stderr, + replace_cmd, sort_lines_stdout, extra_env, sync_barrier, @@ -728,6 +733,8 @@ class TestNmcli(NmTestBase): replace_stdout = list(replace_stdout) if replace_stderr is not None: replace_stderr = list(replace_stderr) + if replace_cmd is not None: + replace_cmd = list(replace_cmd) if check_on_disk is _DEFAULT_ARG: check_on_disk = ( expected_returncode is _DEFAULT_ARG @@ -788,6 +795,7 @@ class TestNmcli(NmTestBase): if check_on_disk: cmd = '$NMCLI %s' % (' '.join([Util.quote(a) for a in args[1:]])) + cmd = Util.replace_text(cmd, replace_cmd) content = ('location: %s\n' % (calling_location)).encode('utf8') + \ ('cmd: %s\n' % (cmd)).encode('utf8') + \ From 0d24ac4996738815b050214281470eecf2b991be Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 13 Dec 2019 10:03:18 +0100 Subject: [PATCH 087/109] clients/tests: add NMStubServer.findConnections() helper function Will be used to get all connection from the test stub server. --- clients/tests/test-client.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index 03415cd031..b1b912a273 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -441,11 +441,8 @@ class NMStubServer: if kwargs: # for convenience, we allow the caller to specify arguments # as kwargs. In this case, we construct a a{sv} array as last argument. - kwargs2 = {} args = list(args) - args.append(kwargs2) - for k in kwargs.keys(): - kwargs2[k] = kwargs[k] + args.append(kwargs) return method(*args) def __getattr__(self, member): @@ -456,9 +453,16 @@ class NMStubServer: def addConnection(self, connection, do_verify_strict = True): return self.op_AddConnection(connection, do_verify_strict) + def findConnections(self, **kwargs): + if kwargs: + lst = self.op_FindConnections(**kwargs) + else: + lst = self.op_FindConnections( { } ) + return list([ (str(elem[0]), str(elem[1]), str(elem[2])) for elem in lst ]) + def findConnectionUuid(self, con_id, required = True): try: - u = Util.iter_single(self.op_FindConnections(con_id = con_id))[1] + u = Util.iter_single(self.findConnections(con_id = con_id))[1] assert u, ("Invalid uuid %s" % (u)) except Exception as e: if not required: From 347253be2f3db7185dadecbd4fc10e172d5dc141 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 13 Dec 2019 10:05:00 +0100 Subject: [PATCH 088/109] clients/tests: support Util.replace_text_sort_list() helper This will be necessary to sort a list of text that contains text to replace. The use case is to get all UUIDs from the server, but some of these UUIDs are dynamic. So, in order to have a fixed sort order, we need to handle sorting the list, based on the replacement. --- clients/tests/test-client.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index b1b912a273..4a0201ccca 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -309,6 +309,12 @@ class Util: bb = bb.decode('utf-8') return bb + @staticmethod + def replace_text_sort_list(lst, replace_arr): + lst = [ (Util.replace_text(elem, replace_arr), elem) for elem in lst ] + lst = sorted(lst) + lst = [ tup[1] for tup in lst ] + return list(lst) @staticmethod def debug_dbus_interface(): From f2303424782181cb8b535e8f34c7e36a5d2dfa49 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 13 Dec 2019 10:05:34 +0100 Subject: [PATCH 089/109] clients/tests: add test for selecting fields from multiple connections with `nmcli con show` --- .../test_004.expected | 3536 ++++++++++++----- clients/tests/test-client.py | 7 + 2 files changed, 2439 insertions(+), 1104 deletions(-) diff --git a/clients/tests/test-client.check-on-disk/test_004.expected b/clients/tests/test-client.check-on-disk/test_004.expected index 460931bb5f..a53759500b 100644 --- a/clients/tests/test-client.check-on-disk/test_004.expected +++ b/clients/tests/test-client.check-on-disk/test_004.expected @@ -3894,224 +3894,52 @@ NEIGHBOR[2].SYSTEM-DESCRIPTION: Test system #3 NEIGHBOR[2].SYSTEM-CAPABILITIES: 40 (wlan-access-point,telephone) <<< -size: 4970 +size: 1061 location: clients/tests/test-client.py:test_004()/71 -cmd: $NMCLI --color yes con s con-vpn-1 +cmd: $NMCLI -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA lang: C returncode: 0 -stdout: 4827 bytes +stdout: 704 bytes >>> +connection.id: con-1 +connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d +connection.type: 802-3-ethernet +connection.interface-name: -- + connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP -connection.stable-id: -- connection.type: vpn connection.interface-name: -- -connection.autoconnect: yes -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.multi-connect: 0 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: no -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: unknown -connection.lldp: default -connection.mdns: -1 (default) -connection.llmnr: -1 (default) -connection.wait-device-timeout: -1 -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: -- -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.routing-rules: -- -ipv4.ignore-auto-routes: no -ipv4.ignore-auto-dns: no -ipv4.dhcp-client-id: -- -ipv4.dhcp-iaid: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: yes -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.dhcp-hostname-flags: 0x0 (none) -ipv4.never-default: no -ipv4.may-fail: yes -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: -- -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.routing-rules: -- -ipv6.ignore-auto-routes: no -ipv6.ignore-auto-dns: no -ipv6.never-default: no -ipv6.may-fail: yes -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-duid: -- -ipv6.dhcp-iaid: -- -ipv6.dhcp-send-hostname: yes -ipv6.dhcp-hostname: -- -ipv6.dhcp-hostname-flags: 0x0 (none) -ipv6.token: -- -vpn.service-type: org.freedesktop.NetworkManager.openvpn vpn.user-name: -- -vpn.data: key1 = val1, key2 = val2, key3 = val3 -vpn.secrets: -vpn.persistent: no -vpn.timeout: 0 -proxy.method: none -proxy.browser-only: no -proxy.pac-url: -- -proxy.pac-script: -- -GENERAL.NAME: con-vpn-1 -GENERAL.UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP -GENERAL.DEVICES: wlan0 -GENERAL.IP-IFACE: -- -GENERAL.STATE: activated -GENERAL.DEFAULT: no -GENERAL.DEFAULT6: no -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: yes -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- -VPN.TYPE: openvpn -VPN.USERNAME: -- -VPN.GATEWAY: -- -VPN.BANNER: *** VPN connection con-vpn-1 *** -VPN.VPN-STATE: 5 - VPN connected -VPN.CFG[1]: key1 = val1 -VPN.CFG[2]: key2 = val2 -VPN.CFG[3]: key3 = val3 + +connection.id: con-xx1 +connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA +connection.type: 802-11-wireless +connection.interface-name: -- <<< -size: 5000 +size: 1071 location: clients/tests/test-client.py:test_004()/72 -cmd: $NMCLI --color yes con s con-vpn-1 +cmd: $NMCLI -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA lang: pl_PL.UTF-8 returncode: 0 -stdout: 4847 bytes +stdout: 704 bytes >>> +connection.id: con-1 +connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d +connection.type: 802-3-ethernet +connection.interface-name: -- + connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP -connection.stable-id: -- connection.type: vpn connection.interface-name: -- -connection.autoconnect: tak -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.multi-connect: 0 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: nie -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: nieznane -connection.lldp: default -connection.mdns: -1 (default) -connection.llmnr: -1 (default) -connection.wait-device-timeout: -1 -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: -- -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.routing-rules: -- -ipv4.ignore-auto-routes: nie -ipv4.ignore-auto-dns: nie -ipv4.dhcp-client-id: -- -ipv4.dhcp-iaid: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: tak -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.dhcp-hostname-flags: 0x0 (none) -ipv4.never-default: nie -ipv4.may-fail: tak -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: -- -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.routing-rules: -- -ipv6.ignore-auto-routes: nie -ipv6.ignore-auto-dns: nie -ipv6.never-default: nie -ipv6.may-fail: tak -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-duid: -- -ipv6.dhcp-iaid: -- -ipv6.dhcp-send-hostname: tak -ipv6.dhcp-hostname: -- -ipv6.dhcp-hostname-flags: 0x0 (none) -ipv6.token: -- -vpn.service-type: org.freedesktop.NetworkManager.openvpn vpn.user-name: -- -vpn.data: key1 = val1, key2 = val2, key3 = val3 -vpn.secrets: -vpn.persistent: nie -vpn.timeout: 0 -proxy.method: none -proxy.browser-only: nie -proxy.pac-url: -- -proxy.pac-script: -- -GENERAL.NAME: con-vpn-1 -GENERAL.UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP -GENERAL.DEVICES: wlan0 -GENERAL.IP-IFACE: -- -GENERAL.STATE: aktywowano -GENERAL.DEFAULT: nie -GENERAL.DEFAULT6: nie -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: tak -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- -VPN.TYPE: openvpn -VPN.USERNAME: -- -VPN.GATEWAY: -- -VPN.BANNER: *** VPN connection con-vpn-1 *** -VPN.VPN-STATE: 5 — Połączono z VPN -VPN.CFG[1]: key1 = val1 -VPN.CFG[2]: key2 = val2 -VPN.CFG[3]: key3 = val3 + +connection.id: con-xx1 +connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA +connection.type: 802-11-wireless +connection.interface-name: -- <<< size: 4970 @@ -4334,8 +4162,228 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 3846 +size: 4970 location: clients/tests/test-client.py:test_004()/75 +cmd: $NMCLI --color yes con s con-vpn-1 +lang: C +returncode: 0 +stdout: 4827 bytes +>>> +connection.id: con-vpn-1 +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.stable-id: -- +connection.type: vpn +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.multi-connect: 0 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +connection.llmnr: -1 (default) +connection.wait-device-timeout: -1 +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: -- +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.routing-rules: -- +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-iaid: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.dhcp-hostname-flags: 0x0 (none) +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: -- +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.routing-rules: -- +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-iaid: -- +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.dhcp-hostname-flags: 0x0 (none) +ipv6.token: -- +vpn.service-type: org.freedesktop.NetworkManager.openvpn +vpn.user-name: -- +vpn.data: key1 = val1, key2 = val2, key3 = val3 +vpn.secrets: +vpn.persistent: no +vpn.timeout: 0 +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: con-vpn-1 +GENERAL.UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.DEVICES: wlan0 +GENERAL.IP-IFACE: -- +GENERAL.STATE: activated +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: yes +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- +VPN.TYPE: openvpn +VPN.USERNAME: -- +VPN.GATEWAY: -- +VPN.BANNER: *** VPN connection con-vpn-1 *** +VPN.VPN-STATE: 5 - VPN connected +VPN.CFG[1]: key1 = val1 +VPN.CFG[2]: key2 = val2 +VPN.CFG[3]: key3 = val3 + +<<< +size: 5000 +location: clients/tests/test-client.py:test_004()/76 +cmd: $NMCLI --color yes con s con-vpn-1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4847 bytes +>>> +connection.id: con-vpn-1 +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.stable-id: -- +connection.type: vpn +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.multi-connect: 0 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +connection.llmnr: -1 (default) +connection.wait-device-timeout: -1 +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: -- +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.routing-rules: -- +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-iaid: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.dhcp-hostname-flags: 0x0 (none) +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: -- +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.routing-rules: -- +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-iaid: -- +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.dhcp-hostname-flags: 0x0 (none) +ipv6.token: -- +vpn.service-type: org.freedesktop.NetworkManager.openvpn +vpn.user-name: -- +vpn.data: key1 = val1, key2 = val2, key3 = val3 +vpn.secrets: +vpn.persistent: nie +vpn.timeout: 0 +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: con-vpn-1 +GENERAL.UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.DEVICES: wlan0 +GENERAL.IP-IFACE: -- +GENERAL.STATE: aktywowano +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: tak +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- +VPN.TYPE: openvpn +VPN.USERNAME: -- +VPN.GATEWAY: -- +VPN.BANNER: *** VPN connection con-vpn-1 *** +VPN.VPN-STATE: 5 — Połączono z VPN +VPN.CFG[1]: key1 = val1 +VPN.CFG[2]: key2 = val2 +VPN.CFG[3]: key3 = val3 + +<<< +size: 3846 +location: clients/tests/test-client.py:test_004()/77 cmd: $NMCLI --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 @@ -4424,7 +4472,7 @@ proxy.pac-script: -- <<< size: 3866 -location: clients/tests/test-client.py:test_004()/76 +location: clients/tests/test-client.py:test_004()/78 cmd: $NMCLI --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -4513,7 +4561,7 @@ proxy.pac-script: -- <<< size: 483 -location: clients/tests/test-client.py:test_004()/77 +location: clients/tests/test-client.py:test_004()/79 cmd: $NMCLI --color yes -f VPN con s con-vpn-1 lang: C returncode: 0 @@ -4528,7 +4576,7 @@ vpn.timeout: 0 <<< size: 494 -location: clients/tests/test-client.py:test_004()/78 +location: clients/tests/test-client.py:test_004()/80 cmd: $NMCLI --color yes -f VPN con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -4543,7 +4591,7 @@ vpn.timeout: 0 <<< size: 863 -location: clients/tests/test-client.py:test_004()/79 +location: clients/tests/test-client.py:test_004()/81 cmd: $NMCLI --color yes -f GENERAL con s con-vpn-1 lang: C returncode: 0 @@ -4565,7 +4613,7 @@ GENERAL.MASTER-PATH: -- <<< size: 876 -location: clients/tests/test-client.py:test_004()/80 +location: clients/tests/test-client.py:test_004()/82 cmd: $NMCLI --color yes -f GENERAL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -4587,7 +4635,7 @@ GENERAL.MASTER-PATH: -- <<< size: 550 -location: clients/tests/test-client.py:test_004()/81 +location: clients/tests/test-client.py:test_004()/83 cmd: $NMCLI --color yes dev s lang: C returncode: 0 @@ -4602,7 +4650,7 @@ DEVICE TYPE STATE CONNECTION <<< size: 565 -location: clients/tests/test-client.py:test_004()/82 +location: clients/tests/test-client.py:test_004()/84 cmd: $NMCLI --color yes dev s lang: pl_PL.UTF-8 returncode: 0 @@ -4617,7 +4665,7 @@ DEVICE TYPE STATE CONNECTION <<< size: 1777 -location: clients/tests/test-client.py:test_004()/83 +location: clients/tests/test-client.py:test_004()/85 cmd: $NMCLI --color yes -f all dev status lang: C returncode: 0 @@ -4632,7 +4680,7 @@ DEVICE TYPE STATE IP4-CONNECTIVITY IP6-CONNECTIVITY DBUS-PATH <<< size: 1792 -location: clients/tests/test-client.py:test_004()/84 +location: clients/tests/test-client.py:test_004()/86 cmd: $NMCLI --color yes -f all dev status lang: pl_PL.UTF-8 returncode: 0 @@ -4647,7 +4695,7 @@ DEVICE TYPE STATE IP4-CONNECTIVITY IP6-CONNECTIVITY DBUS-PATH <<< size: 8054 -location: clients/tests/test-client.py:test_004()/85 +location: clients/tests/test-client.py:test_004()/87 cmd: $NMCLI --color yes dev show lang: C returncode: 0 @@ -4793,7 +4841,7 @@ IP6.DOMAIN[1]: sear6.fo.x.y <<< size: 8085 -location: clients/tests/test-client.py:test_004()/86 +location: clients/tests/test-client.py:test_004()/88 cmd: $NMCLI --color yes dev show lang: pl_PL.UTF-8 returncode: 0 @@ -4939,7 +4987,7 @@ IP6.DOMAIN[1]: sear6.fo.x.y <<< size: 22546 -location: clients/tests/test-client.py:test_004()/87 +location: clients/tests/test-client.py:test_004()/89 cmd: $NMCLI --color yes -f all dev show lang: C returncode: 0 @@ -5358,7 +5406,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 22707 -location: clients/tests/test-client.py:test_004()/88 +location: clients/tests/test-client.py:test_004()/90 cmd: $NMCLI --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -5777,7 +5825,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 1505 -location: clients/tests/test-client.py:test_004()/89 +location: clients/tests/test-client.py:test_004()/91 cmd: $NMCLI --color yes dev show wlan0 lang: C returncode: 0 @@ -5810,7 +5858,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 1516 -location: clients/tests/test-client.py:test_004()/90 +location: clients/tests/test-client.py:test_004()/92 cmd: $NMCLI --color yes dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -5843,7 +5891,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 5570 -location: clients/tests/test-client.py:test_004()/91 +location: clients/tests/test-client.py:test_004()/93 cmd: $NMCLI --color yes -f all dev show wlan0 lang: C returncode: 0 @@ -5952,7 +6000,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 5628 -location: clients/tests/test-client.py:test_004()/92 +location: clients/tests/test-client.py:test_004()/94 cmd: $NMCLI --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -6059,102 +6107,6 @@ DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2} CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -<<< -size: 2135 -location: clients/tests/test-client.py:test_004()/93 -cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 -lang: C -returncode: 0 -stdout: 1951 bytes ->>> -GENERAL.DEVICE: wlan0 -GENERAL.TYPE: wifi -GENERAL.NM-TYPE: NMDeviceWifi -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 -GENERAL.VENDOR: -- -GENERAL.PRODUCT: -- -GENERAL.DRIVER: virtual -GENERAL.DRIVER-VERSION: -- -GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: 13:E0:74:85:7C:D9 -GENERAL.MTU: 0 -GENERAL.STATE: 20 (unavailable) -GENERAL.REASON: 0 (No reason given) -GENERAL.IP4-CONNECTIVITY: 0 (unknown) -GENERAL.IP6-CONNECTIVITY: 0 (unknown) -GENERAL.UDI: /sys/devices/virtual/wlan0 -GENERAL.IP-IFACE: -- -GENERAL.IS-SOFTWARE: no -GENERAL.NM-MANAGED: yes -GENERAL.AUTOCONNECT: yes -GENERAL.FIRMWARE-MISSING: no -GENERAL.NM-PLUGIN-MISSING: no -GENERAL.PHYS-PORT-ID: -- -GENERAL.CONNECTION: con-vpn-1 -GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.METERED: unknown -GENERAL.HWADDR: 13:E0:74:85:7C:D9 -WIFI-PROPERTIES.WEP: yes -WIFI-PROPERTIES.WPA: yes -WIFI-PROPERTIES.WPA2: yes -WIFI-PROPERTIES.TKIP: yes -WIFI-PROPERTIES.CCMP: yes -WIFI-PROPERTIES.AP: yes -WIFI-PROPERTIES.ADHOC: yes -WIFI-PROPERTIES.2GHZ: unknown -WIFI-PROPERTIES.5GHZ: unknown -WIFI-PROPERTIES.MESH: no -WIFI-PROPERTIES.IBSS-RSN: no - -<<< -size: 2161 -location: clients/tests/test-client.py:test_004()/94 -cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 -lang: pl_PL.UTF-8 -returncode: 0 -stdout: 1967 bytes ->>> -GENERAL.DEVICE: wlan0 -GENERAL.TYPE: wifi -GENERAL.NM-TYPE: NMDeviceWifi -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 -GENERAL.VENDOR: -- -GENERAL.PRODUCT: -- -GENERAL.DRIVER: virtual -GENERAL.DRIVER-VERSION: -- -GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: 13:E0:74:85:7C:D9 -GENERAL.MTU: 0 -GENERAL.STATE: 20 (niedostępne) -GENERAL.REASON: 0 (Nie podano przyczyny) -GENERAL.IP4-CONNECTIVITY: 0 (nieznane) -GENERAL.IP6-CONNECTIVITY: 0 (nieznane) -GENERAL.UDI: /sys/devices/virtual/wlan0 -GENERAL.IP-IFACE: -- -GENERAL.IS-SOFTWARE: nie -GENERAL.NM-MANAGED: tak -GENERAL.AUTOCONNECT: tak -GENERAL.FIRMWARE-MISSING: nie -GENERAL.NM-PLUGIN-MISSING: nie -GENERAL.PHYS-PORT-ID: -- -GENERAL.CONNECTION: con-vpn-1 -GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.METERED: nieznane -GENERAL.HWADDR: 13:E0:74:85:7C:D9 -WIFI-PROPERTIES.WEP: tak -WIFI-PROPERTIES.WPA: tak -WIFI-PROPERTIES.WPA2: tak -WIFI-PROPERTIES.TKIP: tak -WIFI-PROPERTIES.CCMP: tak -WIFI-PROPERTIES.AP: tak -WIFI-PROPERTIES.ADHOC: tak -WIFI-PROPERTIES.2GHZ: nieznane -WIFI-PROPERTIES.5GHZ: nieznane -WIFI-PROPERTIES.MESH: nie -WIFI-PROPERTIES.IBSS-RSN: nie - <<< size: 2135 location: clients/tests/test-client.py:test_004()/95 @@ -6252,8 +6204,104 @@ WIFI-PROPERTIES.MESH: nie WIFI-PROPERTIES.IBSS-RSN: nie <<< -size: 641 +size: 2135 location: clients/tests/test-client.py:test_004()/97 +cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 +lang: C +returncode: 0 +stdout: 1951 bytes +>>> +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.IP4-CONNECTIVITY: 0 (unknown) +GENERAL.IP6-CONNECTIVITY: 0 (unknown) +GENERAL.UDI: /sys/devices/virtual/wlan0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: no +GENERAL.NM-MANAGED: yes +GENERAL.AUTOCONNECT: yes +GENERAL.FIRMWARE-MISSING: no +GENERAL.NM-PLUGIN-MISSING: no +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: con-vpn-1 +GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: unknown +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +WIFI-PROPERTIES.WEP: yes +WIFI-PROPERTIES.WPA: yes +WIFI-PROPERTIES.WPA2: yes +WIFI-PROPERTIES.TKIP: yes +WIFI-PROPERTIES.CCMP: yes +WIFI-PROPERTIES.AP: yes +WIFI-PROPERTIES.ADHOC: yes +WIFI-PROPERTIES.2GHZ: unknown +WIFI-PROPERTIES.5GHZ: unknown +WIFI-PROPERTIES.MESH: no +WIFI-PROPERTIES.IBSS-RSN: no + +<<< +size: 2161 +location: clients/tests/test-client.py:test_004()/98 +cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1967 bytes +>>> +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/Devices/3 +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.IP4-CONNECTIVITY: 0 (nieznane) +GENERAL.IP6-CONNECTIVITY: 0 (nieznane) +GENERAL.UDI: /sys/devices/virtual/wlan0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: nie +GENERAL.NM-MANAGED: tak +GENERAL.AUTOCONNECT: tak +GENERAL.FIRMWARE-MISSING: nie +GENERAL.NM-PLUGIN-MISSING: nie +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: con-vpn-1 +GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: nieznane +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +WIFI-PROPERTIES.WEP: tak +WIFI-PROPERTIES.WPA: tak +WIFI-PROPERTIES.WPA2: tak +WIFI-PROPERTIES.TKIP: tak +WIFI-PROPERTIES.CCMP: tak +WIFI-PROPERTIES.AP: tak +WIFI-PROPERTIES.ADHOC: tak +WIFI-PROPERTIES.2GHZ: nieznane +WIFI-PROPERTIES.5GHZ: nieznane +WIFI-PROPERTIES.MESH: nie +WIFI-PROPERTIES.IBSS-RSN: nie + +<<< +size: 641 +location: clients/tests/test-client.py:test_004()/99 cmd: $NMCLI --color yes -f DEVICE,TYPE,DBUS-PATH dev lang: C returncode: 0 @@ -6267,8 +6315,8 @@ DEVICE TYPE DBUS-PATH wlan1 wifi /org/freedesktop/NetworkManager/Devices/5 <<< -size: 651 -location: clients/tests/test-client.py:test_004()/98 +size: 652 +location: clients/tests/test-client.py:test_004()/100 cmd: $NMCLI --color yes -f DEVICE,TYPE,DBUS-PATH dev lang: pl_PL.UTF-8 returncode: 0 @@ -6282,8 +6330,8 @@ DEVICE TYPE DBUS-PATH wlan1 wifi /org/freedesktop/NetworkManager/Devices/5 <<< -size: 2603 -location: clients/tests/test-client.py:test_004()/99 +size: 2604 +location: clients/tests/test-client.py:test_004()/101 cmd: $NMCLI --color yes -f ALL device wifi list lang: C returncode: 0 @@ -6301,7 +6349,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 2672 -location: clients/tests/test-client.py:test_004()/100 +location: clients/tests/test-client.py:test_004()/102 cmd: $NMCLI --color yes -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -6319,7 +6367,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 1071 -location: clients/tests/test-client.py:test_004()/101 +location: clients/tests/test-client.py:test_004()/103 cmd: $NMCLI --color yes -f COMMON device wifi list lang: C returncode: 0 @@ -6337,7 +6385,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< size: 1131 -location: clients/tests/test-client.py:test_004()/102 +location: clients/tests/test-client.py:test_004()/104 cmd: $NMCLI --color yes -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -6355,7 +6403,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< size: 2717 -location: clients/tests/test-client.py:test_004()/103 +location: clients/tests/test-client.py:test_004()/105 cmd: $NMCLI --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: C returncode: 0 @@ -6373,7 +6421,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 2785 -location: clients/tests/test-client.py:test_004()/104 +location: clients/tests/test-client.py:test_004()/106 cmd: $NMCLI --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -6391,7 +6439,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 898 -location: clients/tests/test-client.py:test_004()/105 +location: clients/tests/test-client.py:test_004()/107 cmd: $NMCLI --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -6404,7 +6452,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ <<< size: 926 -location: clients/tests/test-client.py:test_004()/106 +location: clients/tests/test-client.py:test_004()/108 cmd: $NMCLI --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -6417,7 +6465,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN <<< size: 437 -location: clients/tests/test-client.py:test_004()/107 +location: clients/tests/test-client.py:test_004()/109 cmd: $NMCLI --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -6430,7 +6478,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SEC <<< size: 463 -location: clients/tests/test-client.py:test_004()/108 +location: clients/tests/test-client.py:test_004()/110 cmd: $NMCLI --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -6443,7 +6491,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BA <<< size: 1011 -location: clients/tests/test-client.py:test_004()/109 +location: clients/tests/test-client.py:test_004()/111 cmd: $NMCLI --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -6456,7 +6504,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ <<< size: 1039 -location: clients/tests/test-client.py:test_004()/110 +location: clients/tests/test-client.py:test_004()/112 cmd: $NMCLI --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -6469,7 +6517,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN <<< size: 5574 -location: clients/tests/test-client.py:test_004()/111 +location: clients/tests/test-client.py:test_004()/113 cmd: $NMCLI --color yes -f ALL device show wlan0 lang: C returncode: 0 @@ -6578,7 +6626,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 5632 -location: clients/tests/test-client.py:test_004()/112 +location: clients/tests/test-client.py:test_004()/114 cmd: $NMCLI --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -6687,7 +6735,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 1519 -location: clients/tests/test-client.py:test_004()/113 +location: clients/tests/test-client.py:test_004()/115 cmd: $NMCLI --color yes -f COMMON device show wlan0 lang: C returncode: 0 @@ -6720,7 +6768,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 1530 -location: clients/tests/test-client.py:test_004()/114 +location: clients/tests/test-client.py:test_004()/116 cmd: $NMCLI --color yes -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -6753,7 +6801,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 5581 -location: clients/tests/test-client.py:test_004()/115 +location: clients/tests/test-client.py:test_004()/117 cmd: $NMCLI --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 @@ -6859,7 +6907,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 5638 -location: clients/tests/test-client.py:test_004()/116 +location: clients/tests/test-client.py:test_004()/118 cmd: $NMCLI --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -6965,7 +7013,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 1442 -location: clients/tests/test-client.py:test_004()/117 +location: clients/tests/test-client.py:test_004()/119 cmd: $NMCLI --color yes dev lldp list ifname eth0 lang: C returncode: 0 @@ -6995,7 +7043,7 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES: 40 (wlan-access-point,telephone) <<< size: 1452 -location: clients/tests/test-client.py:test_004()/118 +location: clients/tests/test-client.py:test_004()/120 cmd: $NMCLI --color yes dev lldp list ifname eth0 lang: pl_PL.UTF-8 returncode: 0 @@ -7023,9 +7071,57 @@ NEIGHBOR[2].SYSTEM-NAME: test3.example.com NEIGHBOR[2].SYSTEM-DESCRIPTION: Test system #3 NEIGHBOR[2].SYSTEM-CAPABILITIES: 40 (wlan-access-point,telephone) +<<< +size: 1074 +location: clients/tests/test-client.py:test_004()/121 +cmd: $NMCLI --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: C +returncode: 0 +stdout: 704 bytes +>>> +connection.id: con-1 +connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d +connection.type: 802-3-ethernet +connection.interface-name: -- + +connection.id: con-vpn-1 +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.type: vpn +connection.interface-name: -- +vpn.user-name: -- + +connection.id: con-xx1 +connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA +connection.type: 802-11-wireless +connection.interface-name: -- + +<<< +size: 1084 +location: clients/tests/test-client.py:test_004()/122 +cmd: $NMCLI --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 704 bytes +>>> +connection.id: con-1 +connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d +connection.type: 802-3-ethernet +connection.interface-name: -- + +connection.id: con-vpn-1 +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.type: vpn +connection.interface-name: -- +vpn.user-name: -- + +connection.id: con-xx1 +connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA +connection.type: 802-11-wireless +connection.interface-name: -- + <<< size: 5980 -location: clients/tests/test-client.py:test_004()/119 +location: clients/tests/test-client.py:test_004()/123 cmd: $NMCLI --pretty con s con-vpn-1 lang: C returncode: 0 @@ -7148,7 +7244,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 6022 -location: clients/tests/test-client.py:test_004()/120 +location: clients/tests/test-client.py:test_004()/124 cmd: $NMCLI --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -7271,7 +7367,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 5980 -location: clients/tests/test-client.py:test_004()/121 +location: clients/tests/test-client.py:test_004()/125 cmd: $NMCLI --pretty con s con-vpn-1 lang: C returncode: 0 @@ -7394,7 +7490,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 6022 -location: clients/tests/test-client.py:test_004()/122 +location: clients/tests/test-client.py:test_004()/126 cmd: $NMCLI --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -7517,7 +7613,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 4463 -location: clients/tests/test-client.py:test_004()/123 +location: clients/tests/test-client.py:test_004()/127 cmd: $NMCLI --pretty -f ALL con s con-vpn-1 lang: C returncode: 0 @@ -7614,7 +7710,7 @@ proxy.pac-script: -- <<< size: 4488 -location: clients/tests/test-client.py:test_004()/124 +location: clients/tests/test-client.py:test_004()/128 cmd: $NMCLI --pretty -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -7711,7 +7807,7 @@ proxy.pac-script: -- <<< size: 780 -location: clients/tests/test-client.py:test_004()/125 +location: clients/tests/test-client.py:test_004()/129 cmd: $NMCLI --pretty -f VPN con s con-vpn-1 lang: C returncode: 0 @@ -7730,7 +7826,7 @@ vpn.timeout: 0 <<< size: 796 -location: clients/tests/test-client.py:test_004()/126 +location: clients/tests/test-client.py:test_004()/130 cmd: $NMCLI --pretty -f VPN con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -7749,7 +7845,7 @@ vpn.timeout: 0 <<< size: 1175 -location: clients/tests/test-client.py:test_004()/127 +location: clients/tests/test-client.py:test_004()/131 cmd: $NMCLI --pretty -f GENERAL con s con-vpn-1 lang: C returncode: 0 @@ -7775,7 +7871,7 @@ GENERAL.MASTER-PATH: -- <<< size: 1195 -location: clients/tests/test-client.py:test_004()/128 +location: clients/tests/test-client.py:test_004()/132 cmd: $NMCLI --pretty -f GENERAL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -7801,7 +7897,7 @@ GENERAL.MASTER-PATH: -- <<< size: 517 -location: clients/tests/test-client.py:test_004()/129 +location: clients/tests/test-client.py:test_004()/133 cmd: $NMCLI --pretty dev s lang: C returncode: 0 @@ -7820,7 +7916,7 @@ wlan1 wifi unavailable -- <<< size: 525 -location: clients/tests/test-client.py:test_004()/130 +location: clients/tests/test-client.py:test_004()/134 cmd: $NMCLI --pretty dev s lang: pl_PL.UTF-8 returncode: 0 @@ -7839,7 +7935,7 @@ wlan1 wifi niedostępne -- <<< size: 1713 -location: clients/tests/test-client.py:test_004()/131 +location: clients/tests/test-client.py:test_004()/135 cmd: $NMCLI --pretty -f all dev status lang: C returncode: 0 @@ -7858,7 +7954,7 @@ wlan1 wifi unavailable unknown unknown /org/freedesk <<< size: 1721 -location: clients/tests/test-client.py:test_004()/132 +location: clients/tests/test-client.py:test_004()/136 cmd: $NMCLI --pretty -f all dev status lang: pl_PL.UTF-8 returncode: 0 @@ -7877,7 +7973,7 @@ wlan1 wifi niedostępne nieznane nieznane /org/freedes <<< size: 12868 -location: clients/tests/test-client.py:test_004()/133 +location: clients/tests/test-client.py:test_004()/137 cmd: $NMCLI --pretty dev show lang: C returncode: 0 @@ -8085,7 +8181,7 @@ IP6.DOMAIN[1]: sear6.fo.x.y <<< size: 12932 -location: clients/tests/test-client.py:test_004()/134 +location: clients/tests/test-client.py:test_004()/138 cmd: $NMCLI --pretty dev show lang: pl_PL.UTF-8 returncode: 0 @@ -8293,7 +8389,7 @@ IP6.DOMAIN[1]: sear6.fo.x.y <<< size: 27195 -location: clients/tests/test-client.py:test_004()/135 +location: clients/tests/test-client.py:test_004()/139 cmd: $NMCLI --pretty -f all dev show lang: C returncode: 0 @@ -8776,7 +8872,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 27389 -location: clients/tests/test-client.py:test_004()/136 +location: clients/tests/test-client.py:test_004()/140 cmd: $NMCLI --pretty -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -9259,7 +9355,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 2434 -location: clients/tests/test-client.py:test_004()/137 +location: clients/tests/test-client.py:test_004()/141 cmd: $NMCLI --pretty dev show wlan0 lang: C returncode: 0 @@ -9304,7 +9400,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 2452 -location: clients/tests/test-client.py:test_004()/138 +location: clients/tests/test-client.py:test_004()/142 cmd: $NMCLI --pretty dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -9349,7 +9445,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 6496 -location: clients/tests/test-client.py:test_004()/139 +location: clients/tests/test-client.py:test_004()/143 cmd: $NMCLI --pretty -f all dev show wlan0 lang: C returncode: 0 @@ -9473,7 +9569,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 6561 -location: clients/tests/test-client.py:test_004()/140 +location: clients/tests/test-client.py:test_004()/144 cmd: $NMCLI --pretty -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -9597,7 +9693,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 2584 -location: clients/tests/test-client.py:test_004()/141 +location: clients/tests/test-client.py:test_004()/145 cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -9651,7 +9747,7 @@ WIFI-PROPERTIES.IBSS-RSN: no <<< size: 2617 -location: clients/tests/test-client.py:test_004()/142 +location: clients/tests/test-client.py:test_004()/146 cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -9705,7 +9801,7 @@ WIFI-PROPERTIES.IBSS-RSN: nie <<< size: 2584 -location: clients/tests/test-client.py:test_004()/143 +location: clients/tests/test-client.py:test_004()/147 cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -9759,7 +9855,7 @@ WIFI-PROPERTIES.IBSS-RSN: no <<< size: 2617 -location: clients/tests/test-client.py:test_004()/144 +location: clients/tests/test-client.py:test_004()/148 cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -9813,7 +9909,7 @@ WIFI-PROPERTIES.IBSS-RSN: nie <<< size: 666 -location: clients/tests/test-client.py:test_004()/145 +location: clients/tests/test-client.py:test_004()/149 cmd: $NMCLI --pretty -f DEVICE,TYPE,DBUS-PATH dev lang: C returncode: 0 @@ -9832,7 +9928,7 @@ wlan1 wifi /org/freedesktop/NetworkManager/Devices/5 <<< size: 669 -location: clients/tests/test-client.py:test_004()/146 +location: clients/tests/test-client.py:test_004()/150 cmd: $NMCLI --pretty -f DEVICE,TYPE,DBUS-PATH dev lang: pl_PL.UTF-8 returncode: 0 @@ -9851,7 +9947,7 @@ wlan1 wifi /org/freedesktop/NetworkManager/Devices/5 <<< size: 3021 -location: clients/tests/test-client.py:test_004()/147 +location: clients/tests/test-client.py:test_004()/151 cmd: $NMCLI --pretty -f ALL device wifi list lang: C returncode: 0 @@ -9881,7 +9977,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 3259 -location: clients/tests/test-client.py:test_004()/148 +location: clients/tests/test-client.py:test_004()/152 cmd: $NMCLI --pretty -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -9911,7 +10007,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 1314 -location: clients/tests/test-client.py:test_004()/149 +location: clients/tests/test-client.py:test_004()/153 cmd: $NMCLI --pretty -f COMMON device wifi list lang: C returncode: 0 @@ -9941,7 +10037,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< size: 1544 -location: clients/tests/test-client.py:test_004()/150 +location: clients/tests/test-client.py:test_004()/154 cmd: $NMCLI --pretty -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -9971,7 +10067,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< size: 3134 -location: clients/tests/test-client.py:test_004()/151 +location: clients/tests/test-client.py:test_004()/155 cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: C returncode: 0 @@ -10001,7 +10097,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 3372 -location: clients/tests/test-client.py:test_004()/152 +location: clients/tests/test-client.py:test_004()/156 cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -10031,7 +10127,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 1136 -location: clients/tests/test-client.py:test_004()/153 +location: clients/tests/test-client.py:test_004()/157 cmd: $NMCLI --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -10048,7 +10144,7 @@ AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MH <<< size: 1224 -location: clients/tests/test-client.py:test_004()/154 +location: clients/tests/test-client.py:test_004()/158 cmd: $NMCLI --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -10065,7 +10161,7 @@ AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 <<< size: 551 -location: clients/tests/test-client.py:test_004()/155 +location: clients/tests/test-client.py:test_004()/159 cmd: $NMCLI --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -10082,7 +10178,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SEC <<< size: 636 -location: clients/tests/test-client.py:test_004()/156 +location: clients/tests/test-client.py:test_004()/160 cmd: $NMCLI --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -10099,7 +10195,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BA <<< size: 1249 -location: clients/tests/test-client.py:test_004()/157 +location: clients/tests/test-client.py:test_004()/161 cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -10116,7 +10212,7 @@ AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MH <<< size: 1337 -location: clients/tests/test-client.py:test_004()/158 +location: clients/tests/test-client.py:test_004()/162 cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -10133,7 +10229,7 @@ AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 <<< size: 6499 -location: clients/tests/test-client.py:test_004()/159 +location: clients/tests/test-client.py:test_004()/163 cmd: $NMCLI --pretty -f ALL device show wlan0 lang: C returncode: 0 @@ -10257,7 +10353,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 6564 -location: clients/tests/test-client.py:test_004()/160 +location: clients/tests/test-client.py:test_004()/164 cmd: $NMCLI --pretty -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -10381,7 +10477,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 2447 -location: clients/tests/test-client.py:test_004()/161 +location: clients/tests/test-client.py:test_004()/165 cmd: $NMCLI --pretty -f COMMON device show wlan0 lang: C returncode: 0 @@ -10426,7 +10522,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 2465 -location: clients/tests/test-client.py:test_004()/162 +location: clients/tests/test-client.py:test_004()/166 cmd: $NMCLI --pretty -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -10471,7 +10567,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 6426 -location: clients/tests/test-client.py:test_004()/163 +location: clients/tests/test-client.py:test_004()/167 cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 @@ -10591,7 +10687,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 6490 -location: clients/tests/test-client.py:test_004()/164 +location: clients/tests/test-client.py:test_004()/168 cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -10711,7 +10807,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 1893 -location: clients/tests/test-client.py:test_004()/165 +location: clients/tests/test-client.py:test_004()/169 cmd: $NMCLI --pretty dev lldp list ifname eth0 lang: C returncode: 0 @@ -10747,7 +10843,7 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES: 40 (wlan-access-point,telephone) <<< size: 1907 -location: clients/tests/test-client.py:test_004()/166 +location: clients/tests/test-client.py:test_004()/170 cmd: $NMCLI --pretty dev lldp list ifname eth0 lang: pl_PL.UTF-8 returncode: 0 @@ -10781,9 +10877,101 @@ NEIGHBOR[2].SYSTEM-DESCRIPTION: Test system #3 NEIGHBOR[2].SYSTEM-CAPABILITIES: 40 (wlan-access-point,telephone) ------------------------------------------------------------------------------- +<<< +size: 2766 +location: clients/tests/test-client.py:test_004()/171 +cmd: $NMCLI --pretty -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: C +returncode: 0 +stdout: 2398 bytes +>>> +=============================================================================== + Connection profile details (con-1) +=============================================================================== +connection.id: con-1 +------------------------------------------------------------------------------- +connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d +------------------------------------------------------------------------------- +connection.type: 802-3-ethernet +------------------------------------------------------------------------------- +connection.interface-name: -- +------------------------------------------------------------------------------- + +=============================================================================== + Connection profile details (con-vpn-1) +=============================================================================== +connection.id: con-vpn-1 +------------------------------------------------------------------------------- +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +------------------------------------------------------------------------------- +connection.type: vpn +------------------------------------------------------------------------------- +connection.interface-name: -- +------------------------------------------------------------------------------- +vpn.user-name: -- +------------------------------------------------------------------------------- + +=============================================================================== + Connection profile details (con-xx1) +=============================================================================== +connection.id: con-xx1 +------------------------------------------------------------------------------- +connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA +------------------------------------------------------------------------------- +connection.type: 802-11-wireless +------------------------------------------------------------------------------- +connection.interface-name: -- +------------------------------------------------------------------------------- + +<<< +size: 2791 +location: clients/tests/test-client.py:test_004()/172 +cmd: $NMCLI --pretty -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2413 bytes +>>> +=============================================================================== + Szczegóły profilu połączenia (con-1) +=============================================================================== +connection.id: con-1 +------------------------------------------------------------------------------- +connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d +------------------------------------------------------------------------------- +connection.type: 802-3-ethernet +------------------------------------------------------------------------------- +connection.interface-name: -- +------------------------------------------------------------------------------- + +=============================================================================== + Szczegóły profilu połączenia (con-vpn-1) +=============================================================================== +connection.id: con-vpn-1 +------------------------------------------------------------------------------- +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +------------------------------------------------------------------------------- +connection.type: vpn +------------------------------------------------------------------------------- +connection.interface-name: -- +------------------------------------------------------------------------------- +vpn.user-name: -- +------------------------------------------------------------------------------- + +=============================================================================== + Szczegóły profilu połączenia (con-xx1) +=============================================================================== +connection.id: con-xx1 +------------------------------------------------------------------------------- +connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA +------------------------------------------------------------------------------- +connection.type: 802-11-wireless +------------------------------------------------------------------------------- +connection.interface-name: -- +------------------------------------------------------------------------------- + <<< size: 5992 -location: clients/tests/test-client.py:test_004()/167 +location: clients/tests/test-client.py:test_004()/173 cmd: $NMCLI --pretty --color yes con s con-vpn-1 lang: C returncode: 0 @@ -10906,7 +11094,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 6034 -location: clients/tests/test-client.py:test_004()/168 +location: clients/tests/test-client.py:test_004()/174 cmd: $NMCLI --pretty --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -11029,7 +11217,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 5992 -location: clients/tests/test-client.py:test_004()/169 +location: clients/tests/test-client.py:test_004()/175 cmd: $NMCLI --pretty --color yes con s con-vpn-1 lang: C returncode: 0 @@ -11152,7 +11340,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 6034 -location: clients/tests/test-client.py:test_004()/170 +location: clients/tests/test-client.py:test_004()/176 cmd: $NMCLI --pretty --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -11275,7 +11463,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 4475 -location: clients/tests/test-client.py:test_004()/171 +location: clients/tests/test-client.py:test_004()/177 cmd: $NMCLI --pretty --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 @@ -11372,7 +11560,7 @@ proxy.pac-script: -- <<< size: 4500 -location: clients/tests/test-client.py:test_004()/172 +location: clients/tests/test-client.py:test_004()/178 cmd: $NMCLI --pretty --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -11469,7 +11657,7 @@ proxy.pac-script: -- <<< size: 792 -location: clients/tests/test-client.py:test_004()/173 +location: clients/tests/test-client.py:test_004()/179 cmd: $NMCLI --pretty --color yes -f VPN con s con-vpn-1 lang: C returncode: 0 @@ -11488,7 +11676,7 @@ vpn.timeout: 0 <<< size: 808 -location: clients/tests/test-client.py:test_004()/174 +location: clients/tests/test-client.py:test_004()/180 cmd: $NMCLI --pretty --color yes -f VPN con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -11507,7 +11695,7 @@ vpn.timeout: 0 <<< size: 1187 -location: clients/tests/test-client.py:test_004()/175 +location: clients/tests/test-client.py:test_004()/181 cmd: $NMCLI --pretty --color yes -f GENERAL con s con-vpn-1 lang: C returncode: 0 @@ -11533,7 +11721,7 @@ GENERAL.MASTER-PATH: -- <<< size: 1207 -location: clients/tests/test-client.py:test_004()/176 +location: clients/tests/test-client.py:test_004()/182 cmd: $NMCLI --pretty --color yes -f GENERAL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -11559,7 +11747,7 @@ GENERAL.MASTER-PATH: -- <<< size: 689 -location: clients/tests/test-client.py:test_004()/177 +location: clients/tests/test-client.py:test_004()/183 cmd: $NMCLI --pretty --color yes dev s lang: C returncode: 0 @@ -11578,7 +11766,7 @@ DEVICE TYPE STATE CONNECTION <<< size: 697 -location: clients/tests/test-client.py:test_004()/178 +location: clients/tests/test-client.py:test_004()/184 cmd: $NMCLI --pretty --color yes dev s lang: pl_PL.UTF-8 returncode: 0 @@ -11597,7 +11785,7 @@ DEVICE TYPE STATE CONNECTION <<< size: 2085 -location: clients/tests/test-client.py:test_004()/179 +location: clients/tests/test-client.py:test_004()/185 cmd: $NMCLI --pretty --color yes -f all dev status lang: C returncode: 0 @@ -11616,7 +11804,7 @@ DEVICE TYPE STATE IP4-CONNECTIVITY IP6-CONNECTIVITY DBUS-PATH <<< size: 2093 -location: clients/tests/test-client.py:test_004()/180 +location: clients/tests/test-client.py:test_004()/186 cmd: $NMCLI --pretty --color yes -f all dev status lang: pl_PL.UTF-8 returncode: 0 @@ -11635,7 +11823,7 @@ DEVICE TYPE STATE IP4-CONNECTIVITY IP6-CONNECTIVITY DBUS-PATH <<< size: 12880 -location: clients/tests/test-client.py:test_004()/181 +location: clients/tests/test-client.py:test_004()/187 cmd: $NMCLI --pretty --color yes dev show lang: C returncode: 0 @@ -11843,7 +12031,7 @@ IP6.DOMAIN[1]: sear6.fo.x.y <<< size: 12944 -location: clients/tests/test-client.py:test_004()/182 +location: clients/tests/test-client.py:test_004()/188 cmd: $NMCLI --pretty --color yes dev show lang: pl_PL.UTF-8 returncode: 0 @@ -12051,7 +12239,7 @@ IP6.DOMAIN[1]: sear6.fo.x.y <<< size: 27531 -location: clients/tests/test-client.py:test_004()/183 +location: clients/tests/test-client.py:test_004()/189 cmd: $NMCLI --pretty --color yes -f all dev show lang: C returncode: 0 @@ -12534,7 +12722,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 27725 -location: clients/tests/test-client.py:test_004()/184 +location: clients/tests/test-client.py:test_004()/190 cmd: $NMCLI --pretty --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -13017,7 +13205,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 2446 -location: clients/tests/test-client.py:test_004()/185 +location: clients/tests/test-client.py:test_004()/191 cmd: $NMCLI --pretty --color yes dev show wlan0 lang: C returncode: 0 @@ -13062,7 +13250,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 2464 -location: clients/tests/test-client.py:test_004()/186 +location: clients/tests/test-client.py:test_004()/192 cmd: $NMCLI --pretty --color yes dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -13107,7 +13295,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 6751 -location: clients/tests/test-client.py:test_004()/187 +location: clients/tests/test-client.py:test_004()/193 cmd: $NMCLI --pretty --color yes -f all dev show wlan0 lang: C returncode: 0 @@ -13231,7 +13419,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 6816 -location: clients/tests/test-client.py:test_004()/188 +location: clients/tests/test-client.py:test_004()/194 cmd: $NMCLI --pretty --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -13355,7 +13543,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 2596 -location: clients/tests/test-client.py:test_004()/189 +location: clients/tests/test-client.py:test_004()/195 cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -13409,7 +13597,7 @@ WIFI-PROPERTIES.IBSS-RSN: no <<< size: 2629 -location: clients/tests/test-client.py:test_004()/190 +location: clients/tests/test-client.py:test_004()/196 cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -13463,7 +13651,7 @@ WIFI-PROPERTIES.IBSS-RSN: nie <<< size: 2596 -location: clients/tests/test-client.py:test_004()/191 +location: clients/tests/test-client.py:test_004()/197 cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -13517,7 +13705,7 @@ WIFI-PROPERTIES.IBSS-RSN: no <<< size: 2629 -location: clients/tests/test-client.py:test_004()/192 +location: clients/tests/test-client.py:test_004()/198 cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -13571,7 +13759,7 @@ WIFI-PROPERTIES.IBSS-RSN: nie <<< size: 798 -location: clients/tests/test-client.py:test_004()/193 +location: clients/tests/test-client.py:test_004()/199 cmd: $NMCLI --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev lang: C returncode: 0 @@ -13590,7 +13778,7 @@ DEVICE TYPE DBUS-PATH <<< size: 801 -location: clients/tests/test-client.py:test_004()/194 +location: clients/tests/test-client.py:test_004()/200 cmd: $NMCLI --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev lang: pl_PL.UTF-8 returncode: 0 @@ -13609,7 +13797,7 @@ DEVICE TYPE DBUS-PATH <<< size: 3645 -location: clients/tests/test-client.py:test_004()/195 +location: clients/tests/test-client.py:test_004()/201 cmd: $NMCLI --pretty --color yes -f ALL device wifi list lang: C returncode: 0 @@ -13639,7 +13827,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 3883 -location: clients/tests/test-client.py:test_004()/196 +location: clients/tests/test-client.py:test_004()/202 cmd: $NMCLI --pretty --color yes -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -13669,7 +13857,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 1650 -location: clients/tests/test-client.py:test_004()/197 +location: clients/tests/test-client.py:test_004()/203 cmd: $NMCLI --pretty --color yes -f COMMON device wifi list lang: C returncode: 0 @@ -13699,7 +13887,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< size: 1880 -location: clients/tests/test-client.py:test_004()/198 +location: clients/tests/test-client.py:test_004()/204 cmd: $NMCLI --pretty --color yes -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -13729,7 +13917,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< size: 3758 -location: clients/tests/test-client.py:test_004()/199 +location: clients/tests/test-client.py:test_004()/205 cmd: $NMCLI --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: C returncode: 0 @@ -13759,7 +13947,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 3996 -location: clients/tests/test-client.py:test_004()/200 +location: clients/tests/test-client.py:test_004()/206 cmd: $NMCLI --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -13789,7 +13977,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 1302 -location: clients/tests/test-client.py:test_004()/201 +location: clients/tests/test-client.py:test_004()/207 cmd: $NMCLI --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -13806,7 +13994,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ <<< size: 1389 -location: clients/tests/test-client.py:test_004()/202 +location: clients/tests/test-client.py:test_004()/208 cmd: $NMCLI --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -13823,7 +14011,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN <<< size: 644 -location: clients/tests/test-client.py:test_004()/203 +location: clients/tests/test-client.py:test_004()/209 cmd: $NMCLI --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -13840,7 +14028,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SEC <<< size: 729 -location: clients/tests/test-client.py:test_004()/204 +location: clients/tests/test-client.py:test_004()/210 cmd: $NMCLI --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -13857,7 +14045,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BA <<< size: 1415 -location: clients/tests/test-client.py:test_004()/205 +location: clients/tests/test-client.py:test_004()/211 cmd: $NMCLI --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -13874,7 +14062,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ <<< size: 1502 -location: clients/tests/test-client.py:test_004()/206 +location: clients/tests/test-client.py:test_004()/212 cmd: $NMCLI --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -13891,7 +14079,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN <<< size: 6754 -location: clients/tests/test-client.py:test_004()/207 +location: clients/tests/test-client.py:test_004()/213 cmd: $NMCLI --pretty --color yes -f ALL device show wlan0 lang: C returncode: 0 @@ -14015,7 +14203,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 6819 -location: clients/tests/test-client.py:test_004()/208 +location: clients/tests/test-client.py:test_004()/214 cmd: $NMCLI --pretty --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -14139,7 +14327,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 2459 -location: clients/tests/test-client.py:test_004()/209 +location: clients/tests/test-client.py:test_004()/215 cmd: $NMCLI --pretty --color yes -f COMMON device show wlan0 lang: C returncode: 0 @@ -14184,7 +14372,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 2477 -location: clients/tests/test-client.py:test_004()/210 +location: clients/tests/test-client.py:test_004()/216 cmd: $NMCLI --pretty --color yes -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -14229,7 +14417,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 6681 -location: clients/tests/test-client.py:test_004()/211 +location: clients/tests/test-client.py:test_004()/217 cmd: $NMCLI --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 @@ -14349,7 +14537,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 6745 -location: clients/tests/test-client.py:test_004()/212 +location: clients/tests/test-client.py:test_004()/218 cmd: $NMCLI --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -14469,7 +14657,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 1905 -location: clients/tests/test-client.py:test_004()/213 +location: clients/tests/test-client.py:test_004()/219 cmd: $NMCLI --pretty --color yes dev lldp list ifname eth0 lang: C returncode: 0 @@ -14505,7 +14693,7 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES: 40 (wlan-access-point,telephone) <<< size: 1919 -location: clients/tests/test-client.py:test_004()/214 +location: clients/tests/test-client.py:test_004()/220 cmd: $NMCLI --pretty --color yes dev lldp list ifname eth0 lang: pl_PL.UTF-8 returncode: 0 @@ -14539,9 +14727,101 @@ NEIGHBOR[2].SYSTEM-DESCRIPTION: Test system #3 NEIGHBOR[2].SYSTEM-CAPABILITIES: 40 (wlan-access-point,telephone) ------------------------------------------------------------------------------- +<<< +size: 2778 +location: clients/tests/test-client.py:test_004()/221 +cmd: $NMCLI --pretty --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: C +returncode: 0 +stdout: 2398 bytes +>>> +=============================================================================== + Connection profile details (con-1) +=============================================================================== +connection.id: con-1 +------------------------------------------------------------------------------- +connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d +------------------------------------------------------------------------------- +connection.type: 802-3-ethernet +------------------------------------------------------------------------------- +connection.interface-name: -- +------------------------------------------------------------------------------- + +=============================================================================== + Connection profile details (con-vpn-1) +=============================================================================== +connection.id: con-vpn-1 +------------------------------------------------------------------------------- +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +------------------------------------------------------------------------------- +connection.type: vpn +------------------------------------------------------------------------------- +connection.interface-name: -- +------------------------------------------------------------------------------- +vpn.user-name: -- +------------------------------------------------------------------------------- + +=============================================================================== + Connection profile details (con-xx1) +=============================================================================== +connection.id: con-xx1 +------------------------------------------------------------------------------- +connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA +------------------------------------------------------------------------------- +connection.type: 802-11-wireless +------------------------------------------------------------------------------- +connection.interface-name: -- +------------------------------------------------------------------------------- + +<<< +size: 2803 +location: clients/tests/test-client.py:test_004()/222 +cmd: $NMCLI --pretty --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2413 bytes +>>> +=============================================================================== + Szczegóły profilu połączenia (con-1) +=============================================================================== +connection.id: con-1 +------------------------------------------------------------------------------- +connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d +------------------------------------------------------------------------------- +connection.type: 802-3-ethernet +------------------------------------------------------------------------------- +connection.interface-name: -- +------------------------------------------------------------------------------- + +=============================================================================== + Szczegóły profilu połączenia (con-vpn-1) +=============================================================================== +connection.id: con-vpn-1 +------------------------------------------------------------------------------- +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +------------------------------------------------------------------------------- +connection.type: vpn +------------------------------------------------------------------------------- +connection.interface-name: -- +------------------------------------------------------------------------------- +vpn.user-name: -- +------------------------------------------------------------------------------- + +=============================================================================== + Szczegóły profilu połączenia (con-xx1) +=============================================================================== +connection.id: con-xx1 +------------------------------------------------------------------------------- +connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA +------------------------------------------------------------------------------- +connection.type: 802-11-wireless +------------------------------------------------------------------------------- +connection.interface-name: -- +------------------------------------------------------------------------------- + <<< size: 2498 -location: clients/tests/test-client.py:test_004()/215 +location: clients/tests/test-client.py:test_004()/223 cmd: $NMCLI --terse con s con-vpn-1 lang: C returncode: 0 @@ -14651,7 +14931,7 @@ VPN.CFG[3]:key3 = val3 <<< size: 2508 -location: clients/tests/test-client.py:test_004()/216 +location: clients/tests/test-client.py:test_004()/224 cmd: $NMCLI --terse con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -14761,7 +15041,7 @@ VPN.CFG[3]:key3 = val3 <<< size: 2498 -location: clients/tests/test-client.py:test_004()/217 +location: clients/tests/test-client.py:test_004()/225 cmd: $NMCLI --terse con s con-vpn-1 lang: C returncode: 0 @@ -14871,7 +15151,7 @@ VPN.CFG[3]:key3 = val3 <<< size: 2508 -location: clients/tests/test-client.py:test_004()/218 +location: clients/tests/test-client.py:test_004()/226 cmd: $NMCLI --terse con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -14981,7 +15261,7 @@ VPN.CFG[3]:key3 = val3 <<< size: 1928 -location: clients/tests/test-client.py:test_004()/219 +location: clients/tests/test-client.py:test_004()/227 cmd: $NMCLI --terse -f ALL con s con-vpn-1 lang: C returncode: 0 @@ -15070,7 +15350,7 @@ proxy.pac-script: <<< size: 1938 -location: clients/tests/test-client.py:test_004()/220 +location: clients/tests/test-client.py:test_004()/228 cmd: $NMCLI --terse -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -15159,7 +15439,7 @@ proxy.pac-script: <<< size: 317 -location: clients/tests/test-client.py:test_004()/221 +location: clients/tests/test-client.py:test_004()/229 cmd: $NMCLI --terse -f VPN con s con-vpn-1 lang: C returncode: 0 @@ -15174,7 +15454,7 @@ vpn.timeout:0 <<< size: 327 -location: clients/tests/test-client.py:test_004()/222 +location: clients/tests/test-client.py:test_004()/230 cmd: $NMCLI --terse -f VPN con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -15189,7 +15469,7 @@ vpn.timeout:0 <<< size: 538 -location: clients/tests/test-client.py:test_004()/223 +location: clients/tests/test-client.py:test_004()/231 cmd: $NMCLI --terse -f GENERAL con s con-vpn-1 lang: C returncode: 0 @@ -15211,7 +15491,7 @@ GENERAL.MASTER-PATH: <<< size: 548 -location: clients/tests/test-client.py:test_004()/224 +location: clients/tests/test-client.py:test_004()/232 cmd: $NMCLI --terse -f GENERAL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -15233,7 +15513,7 @@ GENERAL.MASTER-PATH: <<< size: 264 -location: clients/tests/test-client.py:test_004()/225 +location: clients/tests/test-client.py:test_004()/233 cmd: $NMCLI --terse dev s lang: C returncode: 0 @@ -15247,7 +15527,7 @@ wlan1:wifi:unavailable: <<< size: 274 -location: clients/tests/test-client.py:test_004()/226 +location: clients/tests/test-client.py:test_004()/234 cmd: $NMCLI --terse dev s lang: pl_PL.UTF-8 returncode: 0 @@ -15261,7 +15541,7 @@ wlan1:wifi:unavailable: <<< size: 662 -location: clients/tests/test-client.py:test_004()/227 +location: clients/tests/test-client.py:test_004()/235 cmd: $NMCLI --terse -f all dev status lang: C returncode: 0 @@ -15275,7 +15555,7 @@ wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5 <<< size: 672 -location: clients/tests/test-client.py:test_004()/228 +location: clients/tests/test-client.py:test_004()/236 cmd: $NMCLI --terse -f all dev status lang: pl_PL.UTF-8 returncode: 0 @@ -15289,7 +15569,7 @@ wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5 <<< size: 4535 -location: clients/tests/test-client.py:test_004()/229 +location: clients/tests/test-client.py:test_004()/237 cmd: $NMCLI --terse dev show lang: C returncode: 0 @@ -15435,7 +15715,7 @@ IP6.DOMAIN[1]:sear6.fo.x.y <<< size: 4545 -location: clients/tests/test-client.py:test_004()/230 +location: clients/tests/test-client.py:test_004()/238 cmd: $NMCLI --terse dev show lang: pl_PL.UTF-8 returncode: 0 @@ -15581,7 +15861,7 @@ IP6.DOMAIN[1]:sear6.fo.x.y <<< size: 12893 -location: clients/tests/test-client.py:test_004()/231 +location: clients/tests/test-client.py:test_004()/239 cmd: $NMCLI --terse -f all dev show lang: C returncode: 0 @@ -16000,7 +16280,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 12939 -location: clients/tests/test-client.py:test_004()/232 +location: clients/tests/test-client.py:test_004()/240 cmd: $NMCLI --terse -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -16419,7 +16699,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 877 -location: clients/tests/test-client.py:test_004()/233 +location: clients/tests/test-client.py:test_004()/241 cmd: $NMCLI --terse dev show wlan0 lang: C returncode: 0 @@ -16452,7 +16732,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar <<< size: 887 -location: clients/tests/test-client.py:test_004()/234 +location: clients/tests/test-client.py:test_004()/242 cmd: $NMCLI --terse dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -16485,7 +16765,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar <<< size: 2969 -location: clients/tests/test-client.py:test_004()/235 +location: clients/tests/test-client.py:test_004()/243 cmd: $NMCLI --terse -f all dev show wlan0 lang: C returncode: 0 @@ -16594,7 +16874,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 3006 -location: clients/tests/test-client.py:test_004()/236 +location: clients/tests/test-client.py:test_004()/244 cmd: $NMCLI --terse -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -16703,7 +16983,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 1298 -location: clients/tests/test-client.py:test_004()/237 +location: clients/tests/test-client.py:test_004()/245 cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -16751,7 +17031,7 @@ WIFI-PROPERTIES.IBSS-RSN:no <<< size: 1308 -location: clients/tests/test-client.py:test_004()/238 +location: clients/tests/test-client.py:test_004()/246 cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -16799,7 +17079,7 @@ WIFI-PROPERTIES.IBSS-RSN:no <<< size: 1298 -location: clients/tests/test-client.py:test_004()/239 +location: clients/tests/test-client.py:test_004()/247 cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -16847,7 +17127,7 @@ WIFI-PROPERTIES.IBSS-RSN:no <<< size: 1308 -location: clients/tests/test-client.py:test_004()/240 +location: clients/tests/test-client.py:test_004()/248 cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -16895,7 +17175,7 @@ WIFI-PROPERTIES.IBSS-RSN:no <<< size: 423 -location: clients/tests/test-client.py:test_004()/241 +location: clients/tests/test-client.py:test_004()/249 cmd: $NMCLI --terse -f DEVICE,TYPE,DBUS-PATH dev lang: C returncode: 0 @@ -16909,7 +17189,7 @@ wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5 <<< size: 433 -location: clients/tests/test-client.py:test_004()/242 +location: clients/tests/test-client.py:test_004()/250 cmd: $NMCLI --terse -f DEVICE,TYPE,DBUS-PATH dev lang: pl_PL.UTF-8 returncode: 0 @@ -16923,7 +17203,7 @@ wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5 <<< size: 1081 -location: clients/tests/test-client.py:test_004()/243 +location: clients/tests/test-client.py:test_004()/251 cmd: $NMCLI --terse -f ALL device wifi list lang: C returncode: 0 @@ -16938,7 +17218,7 @@ AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 <<< size: 1139 -location: clients/tests/test-client.py:test_004()/244 +location: clients/tests/test-client.py:test_004()/252 cmd: $NMCLI --terse -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -16953,7 +17233,7 @@ AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:24 <<< size: 430 -location: clients/tests/test-client.py:test_004()/245 +location: clients/tests/test-client.py:test_004()/253 cmd: $NMCLI --terse -f COMMON device wifi list lang: C returncode: 0 @@ -16968,7 +17248,7 @@ stdout: 280 bytes <<< size: 476 -location: clients/tests/test-client.py:test_004()/246 +location: clients/tests/test-client.py:test_004()/254 cmd: $NMCLI --terse -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -16983,7 +17263,7 @@ stdout: 316 bytes <<< size: 1194 -location: clients/tests/test-client.py:test_004()/247 +location: clients/tests/test-client.py:test_004()/255 cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: C returncode: 0 @@ -16998,7 +17278,7 @@ AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 <<< size: 1252 -location: clients/tests/test-client.py:test_004()/248 +location: clients/tests/test-client.py:test_004()/256 cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -17013,7 +17293,7 @@ AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:24 <<< size: 428 -location: clients/tests/test-client.py:test_004()/249 +location: clients/tests/test-client.py:test_004()/257 cmd: $NMCLI --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -17025,7 +17305,7 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 <<< size: 450 -location: clients/tests/test-client.py:test_004()/250 +location: clients/tests/test-client.py:test_004()/258 cmd: $NMCLI --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -17037,7 +17317,7 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:24 <<< size: 247 -location: clients/tests/test-client.py:test_004()/251 +location: clients/tests/test-client.py:test_004()/259 cmd: $NMCLI --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -17049,7 +17329,7 @@ stdout: 74 bytes <<< size: 266 -location: clients/tests/test-client.py:test_004()/252 +location: clients/tests/test-client.py:test_004()/260 cmd: $NMCLI --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -17061,7 +17341,7 @@ stdout: 83 bytes <<< size: 541 -location: clients/tests/test-client.py:test_004()/253 +location: clients/tests/test-client.py:test_004()/261 cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -17073,7 +17353,7 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 <<< size: 563 -location: clients/tests/test-client.py:test_004()/254 +location: clients/tests/test-client.py:test_004()/262 cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -17085,7 +17365,7 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:24 <<< size: 2972 -location: clients/tests/test-client.py:test_004()/255 +location: clients/tests/test-client.py:test_004()/263 cmd: $NMCLI --terse -f ALL device show wlan0 lang: C returncode: 0 @@ -17194,7 +17474,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 3009 -location: clients/tests/test-client.py:test_004()/256 +location: clients/tests/test-client.py:test_004()/264 cmd: $NMCLI --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -17303,7 +17583,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 890 -location: clients/tests/test-client.py:test_004()/257 +location: clients/tests/test-client.py:test_004()/265 cmd: $NMCLI --terse -f COMMON device show wlan0 lang: C returncode: 0 @@ -17336,7 +17616,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar <<< size: 900 -location: clients/tests/test-client.py:test_004()/258 +location: clients/tests/test-client.py:test_004()/266 cmd: $NMCLI --terse -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -17369,7 +17649,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar <<< size: 3031 -location: clients/tests/test-client.py:test_004()/259 +location: clients/tests/test-client.py:test_004()/267 cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 @@ -17475,7 +17755,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 3068 -location: clients/tests/test-client.py:test_004()/260 +location: clients/tests/test-client.py:test_004()/268 cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -17581,7 +17861,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 1131 -location: clients/tests/test-client.py:test_004()/261 +location: clients/tests/test-client.py:test_004()/269 cmd: $NMCLI --terse dev lldp list ifname eth0 lang: C returncode: 0 @@ -17611,7 +17891,7 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES:40 (wlan-access-point,telephone) <<< size: 1141 -location: clients/tests/test-client.py:test_004()/262 +location: clients/tests/test-client.py:test_004()/270 cmd: $NMCLI --terse dev lldp list ifname eth0 lang: pl_PL.UTF-8 returncode: 0 @@ -17639,9 +17919,57 @@ NEIGHBOR[2].SYSTEM-NAME:test3.example.com NEIGHBOR[2].SYSTEM-DESCRIPTION:Test system #3 NEIGHBOR[2].SYSTEM-CAPABILITIES:40 (wlan-access-point,telephone) +<<< +size: 772 +location: clients/tests/test-client.py:test_004()/271 +cmd: $NMCLI --terse -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: C +returncode: 0 +stdout: 406 bytes +>>> +connection.id:con-1 +connection.uuid:5fcfd6d7-1e63-3332-8826-a7eda103792d +connection.type:802-3-ethernet +connection.interface-name: + +connection.id:con-vpn-1 +connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.type:vpn +connection.interface-name: +vpn.user-name: + +connection.id:con-xx1 +connection.uuid:UUID-con-xx1-REPLACED-REPLACED-REPLA +connection.type:802-11-wireless +connection.interface-name: + +<<< +size: 782 +location: clients/tests/test-client.py:test_004()/272 +cmd: $NMCLI --terse -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 406 bytes +>>> +connection.id:con-1 +connection.uuid:5fcfd6d7-1e63-3332-8826-a7eda103792d +connection.type:802-3-ethernet +connection.interface-name: + +connection.id:con-vpn-1 +connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.type:vpn +connection.interface-name: +vpn.user-name: + +connection.id:con-xx1 +connection.uuid:UUID-con-xx1-REPLACED-REPLACED-REPLA +connection.type:802-11-wireless +connection.interface-name: + <<< size: 2510 -location: clients/tests/test-client.py:test_004()/263 +location: clients/tests/test-client.py:test_004()/273 cmd: $NMCLI --terse --color yes con s con-vpn-1 lang: C returncode: 0 @@ -17751,7 +18079,7 @@ VPN.CFG[3]:key3 = val3 <<< size: 2520 -location: clients/tests/test-client.py:test_004()/264 +location: clients/tests/test-client.py:test_004()/274 cmd: $NMCLI --terse --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -17861,7 +18189,7 @@ VPN.CFG[3]:key3 = val3 <<< size: 2510 -location: clients/tests/test-client.py:test_004()/265 +location: clients/tests/test-client.py:test_004()/275 cmd: $NMCLI --terse --color yes con s con-vpn-1 lang: C returncode: 0 @@ -17971,7 +18299,7 @@ VPN.CFG[3]:key3 = val3 <<< size: 2520 -location: clients/tests/test-client.py:test_004()/266 +location: clients/tests/test-client.py:test_004()/276 cmd: $NMCLI --terse --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -18081,7 +18409,7 @@ VPN.CFG[3]:key3 = val3 <<< size: 1940 -location: clients/tests/test-client.py:test_004()/267 +location: clients/tests/test-client.py:test_004()/277 cmd: $NMCLI --terse --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 @@ -18170,7 +18498,7 @@ proxy.pac-script: <<< size: 1950 -location: clients/tests/test-client.py:test_004()/268 +location: clients/tests/test-client.py:test_004()/278 cmd: $NMCLI --terse --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -18259,7 +18587,7 @@ proxy.pac-script: <<< size: 329 -location: clients/tests/test-client.py:test_004()/269 +location: clients/tests/test-client.py:test_004()/279 cmd: $NMCLI --terse --color yes -f VPN con s con-vpn-1 lang: C returncode: 0 @@ -18274,7 +18602,7 @@ vpn.timeout:0 <<< size: 339 -location: clients/tests/test-client.py:test_004()/270 +location: clients/tests/test-client.py:test_004()/280 cmd: $NMCLI --terse --color yes -f VPN con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -18289,7 +18617,7 @@ vpn.timeout:0 <<< size: 550 -location: clients/tests/test-client.py:test_004()/271 +location: clients/tests/test-client.py:test_004()/281 cmd: $NMCLI --terse --color yes -f GENERAL con s con-vpn-1 lang: C returncode: 0 @@ -18311,7 +18639,7 @@ GENERAL.MASTER-PATH: <<< size: 560 -location: clients/tests/test-client.py:test_004()/272 +location: clients/tests/test-client.py:test_004()/282 cmd: $NMCLI --terse --color yes -f GENERAL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -18333,7 +18661,7 @@ GENERAL.MASTER-PATH: <<< size: 436 -location: clients/tests/test-client.py:test_004()/273 +location: clients/tests/test-client.py:test_004()/283 cmd: $NMCLI --terse --color yes dev s lang: C returncode: 0 @@ -18347,7 +18675,7 @@ stdout: 295 bytes <<< size: 446 -location: clients/tests/test-client.py:test_004()/274 +location: clients/tests/test-client.py:test_004()/284 cmd: $NMCLI --terse --color yes dev s lang: pl_PL.UTF-8 returncode: 0 @@ -18361,7 +18689,7 @@ stdout: 295 bytes <<< size: 1034 -location: clients/tests/test-client.py:test_004()/275 +location: clients/tests/test-client.py:test_004()/285 cmd: $NMCLI --terse --color yes -f all dev status lang: C returncode: 0 @@ -18375,7 +18703,7 @@ stdout: 881 bytes <<< size: 1044 -location: clients/tests/test-client.py:test_004()/276 +location: clients/tests/test-client.py:test_004()/286 cmd: $NMCLI --terse --color yes -f all dev status lang: pl_PL.UTF-8 returncode: 0 @@ -18389,7 +18717,7 @@ stdout: 881 bytes <<< size: 4547 -location: clients/tests/test-client.py:test_004()/277 +location: clients/tests/test-client.py:test_004()/287 cmd: $NMCLI --terse --color yes dev show lang: C returncode: 0 @@ -18535,7 +18863,7 @@ IP6.DOMAIN[1]:sear6.fo.x.y <<< size: 4557 -location: clients/tests/test-client.py:test_004()/278 +location: clients/tests/test-client.py:test_004()/288 cmd: $NMCLI --terse --color yes dev show lang: pl_PL.UTF-8 returncode: 0 @@ -18681,7 +19009,7 @@ IP6.DOMAIN[1]:sear6.fo.x.y <<< size: 13229 -location: clients/tests/test-client.py:test_004()/279 +location: clients/tests/test-client.py:test_004()/289 cmd: $NMCLI --terse --color yes -f all dev show lang: C returncode: 0 @@ -19100,7 +19428,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 13275 -location: clients/tests/test-client.py:test_004()/280 +location: clients/tests/test-client.py:test_004()/290 cmd: $NMCLI --terse --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -19519,7 +19847,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 889 -location: clients/tests/test-client.py:test_004()/281 +location: clients/tests/test-client.py:test_004()/291 cmd: $NMCLI --terse --color yes dev show wlan0 lang: C returncode: 0 @@ -19552,7 +19880,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar <<< size: 899 -location: clients/tests/test-client.py:test_004()/282 +location: clients/tests/test-client.py:test_004()/292 cmd: $NMCLI --terse --color yes dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -19585,7 +19913,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar <<< size: 3224 -location: clients/tests/test-client.py:test_004()/283 +location: clients/tests/test-client.py:test_004()/293 cmd: $NMCLI --terse --color yes -f all dev show wlan0 lang: C returncode: 0 @@ -19694,7 +20022,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 3261 -location: clients/tests/test-client.py:test_004()/284 +location: clients/tests/test-client.py:test_004()/294 cmd: $NMCLI --terse --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -19803,7 +20131,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 1310 -location: clients/tests/test-client.py:test_004()/285 +location: clients/tests/test-client.py:test_004()/295 cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -19851,7 +20179,7 @@ WIFI-PROPERTIES.IBSS-RSN:no <<< size: 1320 -location: clients/tests/test-client.py:test_004()/286 +location: clients/tests/test-client.py:test_004()/296 cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -19899,7 +20227,7 @@ WIFI-PROPERTIES.IBSS-RSN:no <<< size: 1310 -location: clients/tests/test-client.py:test_004()/287 +location: clients/tests/test-client.py:test_004()/297 cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -19947,7 +20275,7 @@ WIFI-PROPERTIES.IBSS-RSN:no <<< size: 1320 -location: clients/tests/test-client.py:test_004()/288 +location: clients/tests/test-client.py:test_004()/298 cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -19995,7 +20323,7 @@ WIFI-PROPERTIES.IBSS-RSN:no <<< size: 555 -location: clients/tests/test-client.py:test_004()/289 +location: clients/tests/test-client.py:test_004()/299 cmd: $NMCLI --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev lang: C returncode: 0 @@ -20009,7 +20337,7 @@ stdout: 391 bytes <<< size: 565 -location: clients/tests/test-client.py:test_004()/290 +location: clients/tests/test-client.py:test_004()/300 cmd: $NMCLI --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev lang: pl_PL.UTF-8 returncode: 0 @@ -20023,7 +20351,7 @@ stdout: 391 bytes <<< size: 1706 -location: clients/tests/test-client.py:test_004()/291 +location: clients/tests/test-client.py:test_004()/301 cmd: $NMCLI --terse --color yes -f ALL device wifi list lang: C returncode: 0 @@ -20038,7 +20366,7 @@ stdout: 1546 bytes <<< size: 1764 -location: clients/tests/test-client.py:test_004()/292 +location: clients/tests/test-client.py:test_004()/302 cmd: $NMCLI --terse --color yes -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -20053,7 +20381,7 @@ stdout: 1594 bytes <<< size: 766 -location: clients/tests/test-client.py:test_004()/293 +location: clients/tests/test-client.py:test_004()/303 cmd: $NMCLI --terse --color yes -f COMMON device wifi list lang: C returncode: 0 @@ -20068,7 +20396,7 @@ stdout: 604 bytes <<< size: 812 -location: clients/tests/test-client.py:test_004()/294 +location: clients/tests/test-client.py:test_004()/304 cmd: $NMCLI --terse --color yes -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -20083,7 +20411,7 @@ stdout: 640 bytes <<< size: 1819 -location: clients/tests/test-client.py:test_004()/295 +location: clients/tests/test-client.py:test_004()/305 cmd: $NMCLI --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: C returncode: 0 @@ -20098,7 +20426,7 @@ stdout: 1546 bytes <<< size: 1877 -location: clients/tests/test-client.py:test_004()/296 +location: clients/tests/test-client.py:test_004()/306 cmd: $NMCLI --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -20113,7 +20441,7 @@ stdout: 1594 bytes <<< size: 593 -location: clients/tests/test-client.py:test_004()/297 +location: clients/tests/test-client.py:test_004()/307 cmd: $NMCLI --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -20125,7 +20453,7 @@ stdout: 410 bytes <<< size: 615 -location: clients/tests/test-client.py:test_004()/298 +location: clients/tests/test-client.py:test_004()/308 cmd: $NMCLI --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -20137,7 +20465,7 @@ stdout: 422 bytes <<< size: 341 -location: clients/tests/test-client.py:test_004()/299 +location: clients/tests/test-client.py:test_004()/309 cmd: $NMCLI --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -20149,7 +20477,7 @@ stdout: 155 bytes <<< size: 360 -location: clients/tests/test-client.py:test_004()/300 +location: clients/tests/test-client.py:test_004()/310 cmd: $NMCLI --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -20161,7 +20489,7 @@ stdout: 164 bytes <<< size: 706 -location: clients/tests/test-client.py:test_004()/301 +location: clients/tests/test-client.py:test_004()/311 cmd: $NMCLI --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -20173,7 +20501,7 @@ stdout: 410 bytes <<< size: 728 -location: clients/tests/test-client.py:test_004()/302 +location: clients/tests/test-client.py:test_004()/312 cmd: $NMCLI --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -20185,7 +20513,7 @@ stdout: 422 bytes <<< size: 3227 -location: clients/tests/test-client.py:test_004()/303 +location: clients/tests/test-client.py:test_004()/313 cmd: $NMCLI --terse --color yes -f ALL device show wlan0 lang: C returncode: 0 @@ -20294,7 +20622,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 3264 -location: clients/tests/test-client.py:test_004()/304 +location: clients/tests/test-client.py:test_004()/314 cmd: $NMCLI --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -20403,7 +20731,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 902 -location: clients/tests/test-client.py:test_004()/305 +location: clients/tests/test-client.py:test_004()/315 cmd: $NMCLI --terse --color yes -f COMMON device show wlan0 lang: C returncode: 0 @@ -20436,7 +20764,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar <<< size: 912 -location: clients/tests/test-client.py:test_004()/306 +location: clients/tests/test-client.py:test_004()/316 cmd: $NMCLI --terse --color yes -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -20469,7 +20797,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar <<< size: 3286 -location: clients/tests/test-client.py:test_004()/307 +location: clients/tests/test-client.py:test_004()/317 cmd: $NMCLI --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 @@ -20575,7 +20903,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 3323 -location: clients/tests/test-client.py:test_004()/308 +location: clients/tests/test-client.py:test_004()/318 cmd: $NMCLI --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -20681,7 +21009,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 1143 -location: clients/tests/test-client.py:test_004()/309 +location: clients/tests/test-client.py:test_004()/319 cmd: $NMCLI --terse --color yes dev lldp list ifname eth0 lang: C returncode: 0 @@ -20711,7 +21039,7 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES:40 (wlan-access-point,telephone) <<< size: 1153 -location: clients/tests/test-client.py:test_004()/310 +location: clients/tests/test-client.py:test_004()/320 cmd: $NMCLI --terse --color yes dev lldp list ifname eth0 lang: pl_PL.UTF-8 returncode: 0 @@ -20739,9 +21067,57 @@ NEIGHBOR[2].SYSTEM-NAME:test3.example.com NEIGHBOR[2].SYSTEM-DESCRIPTION:Test system #3 NEIGHBOR[2].SYSTEM-CAPABILITIES:40 (wlan-access-point,telephone) +<<< +size: 784 +location: clients/tests/test-client.py:test_004()/321 +cmd: $NMCLI --terse --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: C +returncode: 0 +stdout: 406 bytes +>>> +connection.id:con-1 +connection.uuid:5fcfd6d7-1e63-3332-8826-a7eda103792d +connection.type:802-3-ethernet +connection.interface-name: + +connection.id:con-vpn-1 +connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.type:vpn +connection.interface-name: +vpn.user-name: + +connection.id:con-xx1 +connection.uuid:UUID-con-xx1-REPLACED-REPLACED-REPLA +connection.type:802-11-wireless +connection.interface-name: + +<<< +size: 794 +location: clients/tests/test-client.py:test_004()/322 +cmd: $NMCLI --terse --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 406 bytes +>>> +connection.id:con-1 +connection.uuid:5fcfd6d7-1e63-3332-8826-a7eda103792d +connection.type:802-3-ethernet +connection.interface-name: + +connection.id:con-vpn-1 +connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.type:vpn +connection.interface-name: +vpn.user-name: + +connection.id:con-xx1 +connection.uuid:UUID-con-xx1-REPLACED-REPLACED-REPLA +connection.type:802-11-wireless +connection.interface-name: + <<< size: 3223 -location: clients/tests/test-client.py:test_004()/311 +location: clients/tests/test-client.py:test_004()/323 cmd: $NMCLI --mode tabular con s con-vpn-1 lang: C returncode: 0 @@ -20770,7 +21146,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN conn <<< size: 3246 -location: clients/tests/test-client.py:test_004()/312 +location: clients/tests/test-client.py:test_004()/324 cmd: $NMCLI --mode tabular con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -20799,7 +21175,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połą <<< size: 3223 -location: clients/tests/test-client.py:test_004()/313 +location: clients/tests/test-client.py:test_004()/325 cmd: $NMCLI --mode tabular con s con-vpn-1 lang: C returncode: 0 @@ -20828,7 +21204,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN conn <<< size: 3246 -location: clients/tests/test-client.py:test_004()/314 +location: clients/tests/test-client.py:test_004()/326 cmd: $NMCLI --mode tabular con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -20857,7 +21233,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połą <<< size: 2471 -location: clients/tests/test-client.py:test_004()/315 +location: clients/tests/test-client.py:test_004()/327 cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1 lang: C returncode: 0 @@ -20881,7 +21257,7 @@ proxy none no -- -- <<< size: 2483 -location: clients/tests/test-client.py:test_004()/316 +location: clients/tests/test-client.py:test_004()/328 cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -20905,7 +21281,7 @@ proxy none nie -- -- <<< size: 407 -location: clients/tests/test-client.py:test_004()/317 +location: clients/tests/test-client.py:test_004()/329 cmd: $NMCLI --mode tabular -f VPN con s con-vpn-1 lang: C returncode: 0 @@ -20916,7 +21292,7 @@ vpn org.freedesktop.NetworkManager.openvpn -- key1 = val1, key2 = val <<< size: 417 -location: clients/tests/test-client.py:test_004()/318 +location: clients/tests/test-client.py:test_004()/330 cmd: $NMCLI --mode tabular -f VPN con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -20927,7 +21303,7 @@ vpn org.freedesktop.NetworkManager.openvpn -- key1 = val1, key2 = val <<< size: 659 -location: clients/tests/test-client.py:test_004()/319 +location: clients/tests/test-client.py:test_004()/331 cmd: $NMCLI --mode tabular -f GENERAL con s con-vpn-1 lang: C returncode: 0 @@ -20938,7 +21314,7 @@ GENERAL con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP wlan0 -- act <<< size: 671 -location: clients/tests/test-client.py:test_004()/320 +location: clients/tests/test-client.py:test_004()/332 cmd: $NMCLI --mode tabular -f GENERAL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -20949,7 +21325,7 @@ GENERAL con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP wlan0 -- akt <<< size: 394 -location: clients/tests/test-client.py:test_004()/321 +location: clients/tests/test-client.py:test_004()/333 cmd: $NMCLI --mode tabular dev s lang: C returncode: 0 @@ -20964,7 +21340,7 @@ wlan1 wifi unavailable -- <<< size: 409 -location: clients/tests/test-client.py:test_004()/322 +location: clients/tests/test-client.py:test_004()/334 cmd: $NMCLI --mode tabular dev s lang: pl_PL.UTF-8 returncode: 0 @@ -20979,7 +21355,7 @@ wlan1 wifi niedostępne -- <<< size: 1421 -location: clients/tests/test-client.py:test_004()/323 +location: clients/tests/test-client.py:test_004()/335 cmd: $NMCLI --mode tabular -f all dev status lang: C returncode: 0 @@ -20994,7 +21370,7 @@ wlan1 wifi unavailable unknown unknown /org/freedesk <<< size: 1436 -location: clients/tests/test-client.py:test_004()/324 +location: clients/tests/test-client.py:test_004()/336 cmd: $NMCLI --mode tabular -f all dev status lang: pl_PL.UTF-8 returncode: 0 @@ -21009,7 +21385,7 @@ wlan1 wifi niedostępne nieznane nieznane /org/freedes <<< size: 6356 -location: clients/tests/test-client.py:test_004()/325 +location: clients/tests/test-client.py:test_004()/337 cmd: $NMCLI --mode tabular dev show lang: C returncode: 0 @@ -21158,7 +21534,7 @@ IP6 2001:a::88ca:3654:96b:ab44/89 -- dst = 2001:a::cc8b:7c09:4673:bbb0 <<< size: 6383 -location: clients/tests/test-client.py:test_004()/326 +location: clients/tests/test-client.py:test_004()/338 cmd: $NMCLI --mode tabular dev show lang: pl_PL.UTF-8 returncode: 0 @@ -21307,7 +21683,7 @@ IP6 2001:a::88ca:3654:96b:ab44/89 -- dst = 2001:a::cc8b:7c09:4673:bbb0 <<< size: 15918 -location: clients/tests/test-client.py:test_004()/327 +location: clients/tests/test-client.py:test_004()/339 cmd: $NMCLI --mode tabular -f all dev show lang: C returncode: 0 @@ -21460,7 +21836,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 16077 -location: clients/tests/test-client.py:test_004()/328 +location: clients/tests/test-client.py:test_004()/340 cmd: $NMCLI --mode tabular -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -21613,7 +21989,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 1125 -location: clients/tests/test-client.py:test_004()/329 +location: clients/tests/test-client.py:test_004()/341 cmd: $NMCLI --mode tabular dev show wlan0 lang: C returncode: 0 @@ -21648,7 +22024,7 @@ IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250 <<< size: 1136 -location: clients/tests/test-client.py:test_004()/330 +location: clients/tests/test-client.py:test_004()/342 cmd: $NMCLI --mode tabular dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -21683,7 +22059,7 @@ IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250 <<< size: 3284 -location: clients/tests/test-client.py:test_004()/331 +location: clients/tests/test-client.py:test_004()/343 cmd: $NMCLI --mode tabular -f all dev show wlan0 lang: C returncode: 0 @@ -21723,7 +22099,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 3347 -location: clients/tests/test-client.py:test_004()/332 +location: clients/tests/test-client.py:test_004()/344 cmd: $NMCLI --mode tabular -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -21763,7 +22139,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 1364 -location: clients/tests/test-client.py:test_004()/333 +location: clients/tests/test-client.py:test_004()/345 cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -21780,7 +22156,7 @@ WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown no <<< size: 1391 -location: clients/tests/test-client.py:test_004()/334 +location: clients/tests/test-client.py:test_004()/346 cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -21797,7 +22173,7 @@ WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane nie <<< size: 1364 -location: clients/tests/test-client.py:test_004()/335 +location: clients/tests/test-client.py:test_004()/347 cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -21814,7 +22190,7 @@ WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown no <<< size: 1391 -location: clients/tests/test-client.py:test_004()/336 +location: clients/tests/test-client.py:test_004()/348 cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -21831,7 +22207,7 @@ WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane nie <<< size: 525 -location: clients/tests/test-client.py:test_004()/337 +location: clients/tests/test-client.py:test_004()/349 cmd: $NMCLI --mode tabular -f DEVICE,TYPE,DBUS-PATH dev lang: C returncode: 0 @@ -21846,7 +22222,7 @@ wlan1 wifi /org/freedesktop/NetworkManager/Devices/5 <<< size: 535 -location: clients/tests/test-client.py:test_004()/338 +location: clients/tests/test-client.py:test_004()/350 cmd: $NMCLI --mode tabular -f DEVICE,TYPE,DBUS-PATH dev lang: pl_PL.UTF-8 returncode: 0 @@ -21861,7 +22237,7 @@ wlan1 wifi /org/freedesktop/NetworkManager/Devices/5 <<< size: 1995 -location: clients/tests/test-client.py:test_004()/339 +location: clients/tests/test-client.py:test_004()/351 cmd: $NMCLI --mode tabular -f ALL device wifi list lang: C returncode: 0 @@ -21879,7 +22255,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 2063 -location: clients/tests/test-client.py:test_004()/340 +location: clients/tests/test-client.py:test_004()/352 cmd: $NMCLI --mode tabular -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -21897,7 +22273,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 750 -location: clients/tests/test-client.py:test_004()/341 +location: clients/tests/test-client.py:test_004()/353 cmd: $NMCLI --mode tabular -f COMMON device wifi list lang: C returncode: 0 @@ -21915,7 +22291,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< size: 810 -location: clients/tests/test-client.py:test_004()/342 +location: clients/tests/test-client.py:test_004()/354 cmd: $NMCLI --mode tabular -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -21933,7 +22309,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< size: 2108 -location: clients/tests/test-client.py:test_004()/343 +location: clients/tests/test-client.py:test_004()/355 cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: C returncode: 0 @@ -21951,7 +22327,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 2176 -location: clients/tests/test-client.py:test_004()/344 +location: clients/tests/test-client.py:test_004()/356 cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -21969,7 +22345,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 748 -location: clients/tests/test-client.py:test_004()/345 +location: clients/tests/test-client.py:test_004()/357 cmd: $NMCLI --mode tabular -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -21982,7 +22358,7 @@ AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MH <<< size: 776 -location: clients/tests/test-client.py:test_004()/346 +location: clients/tests/test-client.py:test_004()/358 cmd: $NMCLI --mode tabular -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -21995,7 +22371,7 @@ AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 <<< size: 359 -location: clients/tests/test-client.py:test_004()/347 +location: clients/tests/test-client.py:test_004()/359 cmd: $NMCLI --mode tabular -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -22008,7 +22384,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SEC <<< size: 385 -location: clients/tests/test-client.py:test_004()/348 +location: clients/tests/test-client.py:test_004()/360 cmd: $NMCLI --mode tabular -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -22021,7 +22397,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BA <<< size: 861 -location: clients/tests/test-client.py:test_004()/349 +location: clients/tests/test-client.py:test_004()/361 cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -22034,7 +22410,7 @@ AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MH <<< size: 889 -location: clients/tests/test-client.py:test_004()/350 +location: clients/tests/test-client.py:test_004()/362 cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -22047,7 +22423,7 @@ AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 <<< size: 3287 -location: clients/tests/test-client.py:test_004()/351 +location: clients/tests/test-client.py:test_004()/363 cmd: $NMCLI --mode tabular -f ALL device show wlan0 lang: C returncode: 0 @@ -22087,7 +22463,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 3350 -location: clients/tests/test-client.py:test_004()/352 +location: clients/tests/test-client.py:test_004()/364 cmd: $NMCLI --mode tabular -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -22127,7 +22503,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 1138 -location: clients/tests/test-client.py:test_004()/353 +location: clients/tests/test-client.py:test_004()/365 cmd: $NMCLI --mode tabular -f COMMON device show wlan0 lang: C returncode: 0 @@ -22162,7 +22538,7 @@ IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250 <<< size: 1149 -location: clients/tests/test-client.py:test_004()/354 +location: clients/tests/test-client.py:test_004()/366 cmd: $NMCLI --mode tabular -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -22197,7 +22573,7 @@ IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250 <<< size: 3342 -location: clients/tests/test-client.py:test_004()/355 +location: clients/tests/test-client.py:test_004()/367 cmd: $NMCLI --mode tabular -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 @@ -22234,7 +22610,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 3405 -location: clients/tests/test-client.py:test_004()/356 +location: clients/tests/test-client.py:test_004()/368 cmd: $NMCLI --mode tabular -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -22271,7 +22647,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 1140 -location: clients/tests/test-client.py:test_004()/357 +location: clients/tests/test-client.py:test_004()/369 cmd: $NMCLI --mode tabular dev lldp list ifname eth0 lang: C returncode: 0 @@ -22284,7 +22660,7 @@ eth0 00:11:22:33:44:22 port1 GigabitEthernet #3 test3.example. <<< size: 1150 -location: clients/tests/test-client.py:test_004()/358 +location: clients/tests/test-client.py:test_004()/370 cmd: $NMCLI --mode tabular dev lldp list ifname eth0 lang: pl_PL.UTF-8 returncode: 0 @@ -22295,9 +22671,107 @@ eth0 00:11:22:33:44:00 Uplink port GigabitEthernet #1 test1.example. eth0 chassis1 44:44:44:44:44:44 GigabitEthernet #2 test2.example.com Test system #2 2047 (other,repeater,mac-bridge,wlan-access-point,router,telephone,docsis-cable-device,station-only,c-vlan-component,s-vlan-component,tpmr) eth0 00:11:22:33:44:22 port1 GigabitEthernet #3 test3.example.com Test system #3 40 (wlan-access-point,telephone) +<<< +size: 865 +location: clients/tests/test-client.py:test_004()/371 +cmd: $NMCLI --mode tabular -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: C +returncode: 0 +stdout: 492 bytes +>>> +id +con-1 + +uuid +5fcfd6d7-1e63-3332-8826-a7eda103792d + +type +802-3-ethernet + +interface-name +-- + + +id +con-vpn-1 + +uuid +UUID-con-vpn-1-REPLACED-REPLACED-REP + +type +vpn + +interface-name +-- + +user-name +-- + +id +con-xx1 + +uuid +UUID-con-xx1-REPLACED-REPLACED-REPLA + +type +802-11-wireless + +interface-name +-- + + +<<< +size: 875 +location: clients/tests/test-client.py:test_004()/372 +cmd: $NMCLI --mode tabular -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 492 bytes +>>> +id +con-1 + +uuid +5fcfd6d7-1e63-3332-8826-a7eda103792d + +type +802-3-ethernet + +interface-name +-- + + +id +con-vpn-1 + +uuid +UUID-con-vpn-1-REPLACED-REPLACED-REP + +type +vpn + +interface-name +-- + +user-name +-- + +id +con-xx1 + +uuid +UUID-con-xx1-REPLACED-REPLACED-REPLA + +type +802-11-wireless + +interface-name +-- + + <<< size: 3235 -location: clients/tests/test-client.py:test_004()/359 +location: clients/tests/test-client.py:test_004()/373 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1 lang: C returncode: 0 @@ -22326,7 +22800,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN conn <<< size: 3258 -location: clients/tests/test-client.py:test_004()/360 +location: clients/tests/test-client.py:test_004()/374 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -22355,7 +22829,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połą <<< size: 3235 -location: clients/tests/test-client.py:test_004()/361 +location: clients/tests/test-client.py:test_004()/375 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1 lang: C returncode: 0 @@ -22384,7 +22858,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN conn <<< size: 3258 -location: clients/tests/test-client.py:test_004()/362 +location: clients/tests/test-client.py:test_004()/376 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -22413,7 +22887,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połą <<< size: 2483 -location: clients/tests/test-client.py:test_004()/363 +location: clients/tests/test-client.py:test_004()/377 cmd: $NMCLI --mode tabular --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 @@ -22437,7 +22911,7 @@ proxy none no -- -- <<< size: 2495 -location: clients/tests/test-client.py:test_004()/364 +location: clients/tests/test-client.py:test_004()/378 cmd: $NMCLI --mode tabular --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -22461,7 +22935,7 @@ proxy none nie -- -- <<< size: 419 -location: clients/tests/test-client.py:test_004()/365 +location: clients/tests/test-client.py:test_004()/379 cmd: $NMCLI --mode tabular --color yes -f VPN con s con-vpn-1 lang: C returncode: 0 @@ -22472,7 +22946,7 @@ vpn org.freedesktop.NetworkManager.openvpn -- key1 = val1, key2 = val <<< size: 429 -location: clients/tests/test-client.py:test_004()/366 +location: clients/tests/test-client.py:test_004()/380 cmd: $NMCLI --mode tabular --color yes -f VPN con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -22483,7 +22957,7 @@ vpn org.freedesktop.NetworkManager.openvpn -- key1 = val1, key2 = val <<< size: 671 -location: clients/tests/test-client.py:test_004()/367 +location: clients/tests/test-client.py:test_004()/381 cmd: $NMCLI --mode tabular --color yes -f GENERAL con s con-vpn-1 lang: C returncode: 0 @@ -22494,7 +22968,7 @@ GENERAL con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP wlan0 -- act <<< size: 683 -location: clients/tests/test-client.py:test_004()/368 +location: clients/tests/test-client.py:test_004()/382 cmd: $NMCLI --mode tabular --color yes -f GENERAL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -22505,7 +22979,7 @@ GENERAL con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP wlan0 -- akt <<< size: 566 -location: clients/tests/test-client.py:test_004()/369 +location: clients/tests/test-client.py:test_004()/383 cmd: $NMCLI --mode tabular --color yes dev s lang: C returncode: 0 @@ -22520,7 +22994,7 @@ DEVICE TYPE STATE CONNECTION <<< size: 581 -location: clients/tests/test-client.py:test_004()/370 +location: clients/tests/test-client.py:test_004()/384 cmd: $NMCLI --mode tabular --color yes dev s lang: pl_PL.UTF-8 returncode: 0 @@ -22535,7 +23009,7 @@ DEVICE TYPE STATE CONNECTION <<< size: 1793 -location: clients/tests/test-client.py:test_004()/371 +location: clients/tests/test-client.py:test_004()/385 cmd: $NMCLI --mode tabular --color yes -f all dev status lang: C returncode: 0 @@ -22550,7 +23024,7 @@ DEVICE TYPE STATE IP4-CONNECTIVITY IP6-CONNECTIVITY DBUS-PATH <<< size: 1808 -location: clients/tests/test-client.py:test_004()/372 +location: clients/tests/test-client.py:test_004()/386 cmd: $NMCLI --mode tabular --color yes -f all dev status lang: pl_PL.UTF-8 returncode: 0 @@ -22565,7 +23039,7 @@ DEVICE TYPE STATE IP4-CONNECTIVITY IP6-CONNECTIVITY DBUS-PATH <<< size: 6368 -location: clients/tests/test-client.py:test_004()/373 +location: clients/tests/test-client.py:test_004()/387 cmd: $NMCLI --mode tabular --color yes dev show lang: C returncode: 0 @@ -22714,7 +23188,7 @@ IP6 2001:a::88ca:3654:96b:ab44/89 -- dst = 2001:a::cc8b:7c09:4673:bbb0 <<< size: 6395 -location: clients/tests/test-client.py:test_004()/374 +location: clients/tests/test-client.py:test_004()/388 cmd: $NMCLI --mode tabular --color yes dev show lang: pl_PL.UTF-8 returncode: 0 @@ -22863,7 +23337,7 @@ IP6 2001:a::88ca:3654:96b:ab44/89 -- dst = 2001:a::cc8b:7c09:4673:bbb0 <<< size: 16290 -location: clients/tests/test-client.py:test_004()/375 +location: clients/tests/test-client.py:test_004()/389 cmd: $NMCLI --mode tabular --color yes -f all dev show lang: C returncode: 0 @@ -23016,7 +23490,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 16449 -location: clients/tests/test-client.py:test_004()/376 +location: clients/tests/test-client.py:test_004()/390 cmd: $NMCLI --mode tabular --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -23169,7 +23643,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 1137 -location: clients/tests/test-client.py:test_004()/377 +location: clients/tests/test-client.py:test_004()/391 cmd: $NMCLI --mode tabular --color yes dev show wlan0 lang: C returncode: 0 @@ -23204,7 +23678,7 @@ IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250 <<< size: 1148 -location: clients/tests/test-client.py:test_004()/378 +location: clients/tests/test-client.py:test_004()/392 cmd: $NMCLI --mode tabular --color yes dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -23239,7 +23713,7 @@ IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250 <<< size: 3566 -location: clients/tests/test-client.py:test_004()/379 +location: clients/tests/test-client.py:test_004()/393 cmd: $NMCLI --mode tabular --color yes -f all dev show wlan0 lang: C returncode: 0 @@ -23279,7 +23753,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 3629 -location: clients/tests/test-client.py:test_004()/380 +location: clients/tests/test-client.py:test_004()/394 cmd: $NMCLI --mode tabular --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -23319,7 +23793,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 1376 -location: clients/tests/test-client.py:test_004()/381 +location: clients/tests/test-client.py:test_004()/395 cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -23336,7 +23810,7 @@ WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown no <<< size: 1403 -location: clients/tests/test-client.py:test_004()/382 +location: clients/tests/test-client.py:test_004()/396 cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -23353,7 +23827,7 @@ WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane nie <<< size: 1376 -location: clients/tests/test-client.py:test_004()/383 +location: clients/tests/test-client.py:test_004()/397 cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -23370,7 +23844,7 @@ WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown no <<< size: 1403 -location: clients/tests/test-client.py:test_004()/384 +location: clients/tests/test-client.py:test_004()/398 cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -23387,7 +23861,7 @@ WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane nie <<< size: 657 -location: clients/tests/test-client.py:test_004()/385 +location: clients/tests/test-client.py:test_004()/399 cmd: $NMCLI --mode tabular --color yes -f DEVICE,TYPE,DBUS-PATH dev lang: C returncode: 0 @@ -23402,7 +23876,7 @@ DEVICE TYPE DBUS-PATH <<< size: 667 -location: clients/tests/test-client.py:test_004()/386 +location: clients/tests/test-client.py:test_004()/400 cmd: $NMCLI --mode tabular --color yes -f DEVICE,TYPE,DBUS-PATH dev lang: pl_PL.UTF-8 returncode: 0 @@ -23417,7 +23891,7 @@ DEVICE TYPE DBUS-PATH <<< size: 2619 -location: clients/tests/test-client.py:test_004()/387 +location: clients/tests/test-client.py:test_004()/401 cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list lang: C returncode: 0 @@ -23435,7 +23909,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 2687 -location: clients/tests/test-client.py:test_004()/388 +location: clients/tests/test-client.py:test_004()/402 cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -23453,7 +23927,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 1086 -location: clients/tests/test-client.py:test_004()/389 +location: clients/tests/test-client.py:test_004()/403 cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list lang: C returncode: 0 @@ -23471,7 +23945,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< size: 1146 -location: clients/tests/test-client.py:test_004()/390 +location: clients/tests/test-client.py:test_004()/404 cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -23489,7 +23963,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< size: 2732 -location: clients/tests/test-client.py:test_004()/391 +location: clients/tests/test-client.py:test_004()/405 cmd: $NMCLI --mode tabular --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: C returncode: 0 @@ -23507,7 +23981,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 2800 -location: clients/tests/test-client.py:test_004()/392 +location: clients/tests/test-client.py:test_004()/406 cmd: $NMCLI --mode tabular --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -23525,7 +23999,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 913 -location: clients/tests/test-client.py:test_004()/393 +location: clients/tests/test-client.py:test_004()/407 cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -23538,7 +24012,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ <<< size: 941 -location: clients/tests/test-client.py:test_004()/394 +location: clients/tests/test-client.py:test_004()/408 cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -23551,7 +24025,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN <<< size: 452 -location: clients/tests/test-client.py:test_004()/395 +location: clients/tests/test-client.py:test_004()/409 cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -23564,7 +24038,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SEC <<< size: 478 -location: clients/tests/test-client.py:test_004()/396 +location: clients/tests/test-client.py:test_004()/410 cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -23577,7 +24051,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BA <<< size: 1026 -location: clients/tests/test-client.py:test_004()/397 +location: clients/tests/test-client.py:test_004()/411 cmd: $NMCLI --mode tabular --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -23590,7 +24064,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ <<< size: 1054 -location: clients/tests/test-client.py:test_004()/398 +location: clients/tests/test-client.py:test_004()/412 cmd: $NMCLI --mode tabular --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -23603,7 +24077,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN <<< size: 3569 -location: clients/tests/test-client.py:test_004()/399 +location: clients/tests/test-client.py:test_004()/413 cmd: $NMCLI --mode tabular --color yes -f ALL device show wlan0 lang: C returncode: 0 @@ -23643,7 +24117,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 3632 -location: clients/tests/test-client.py:test_004()/400 +location: clients/tests/test-client.py:test_004()/414 cmd: $NMCLI --mode tabular --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -23683,7 +24157,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 1150 -location: clients/tests/test-client.py:test_004()/401 +location: clients/tests/test-client.py:test_004()/415 cmd: $NMCLI --mode tabular --color yes -f COMMON device show wlan0 lang: C returncode: 0 @@ -23718,7 +24192,7 @@ IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250 <<< size: 1161 -location: clients/tests/test-client.py:test_004()/402 +location: clients/tests/test-client.py:test_004()/416 cmd: $NMCLI --mode tabular --color yes -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -23753,7 +24227,7 @@ IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250 <<< size: 3624 -location: clients/tests/test-client.py:test_004()/403 +location: clients/tests/test-client.py:test_004()/417 cmd: $NMCLI --mode tabular --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 @@ -23790,7 +24264,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 3687 -location: clients/tests/test-client.py:test_004()/404 +location: clients/tests/test-client.py:test_004()/418 cmd: $NMCLI --mode tabular --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -23827,7 +24301,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 1152 -location: clients/tests/test-client.py:test_004()/405 +location: clients/tests/test-client.py:test_004()/419 cmd: $NMCLI --mode tabular --color yes dev lldp list ifname eth0 lang: C returncode: 0 @@ -23840,7 +24314,7 @@ eth0 00:11:22:33:44:22 port1 GigabitEthernet #3 test3.example. <<< size: 1162 -location: clients/tests/test-client.py:test_004()/406 +location: clients/tests/test-client.py:test_004()/420 cmd: $NMCLI --mode tabular --color yes dev lldp list ifname eth0 lang: pl_PL.UTF-8 returncode: 0 @@ -23851,9 +24325,107 @@ eth0 00:11:22:33:44:00 Uplink port GigabitEthernet #1 test1.example. eth0 chassis1 44:44:44:44:44:44 GigabitEthernet #2 test2.example.com Test system #2 2047 (other,repeater,mac-bridge,wlan-access-point,router,telephone,docsis-cable-device,station-only,c-vlan-component,s-vlan-component,tpmr) eth0 00:11:22:33:44:22 port1 GigabitEthernet #3 test3.example.com Test system #3 40 (wlan-access-point,telephone) +<<< +size: 877 +location: clients/tests/test-client.py:test_004()/421 +cmd: $NMCLI --mode tabular --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: C +returncode: 0 +stdout: 492 bytes +>>> +id +con-1 + +uuid +5fcfd6d7-1e63-3332-8826-a7eda103792d + +type +802-3-ethernet + +interface-name +-- + + +id +con-vpn-1 + +uuid +UUID-con-vpn-1-REPLACED-REPLACED-REP + +type +vpn + +interface-name +-- + +user-name +-- + +id +con-xx1 + +uuid +UUID-con-xx1-REPLACED-REPLACED-REPLA + +type +802-11-wireless + +interface-name +-- + + +<<< +size: 887 +location: clients/tests/test-client.py:test_004()/422 +cmd: $NMCLI --mode tabular --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 492 bytes +>>> +id +con-1 + +uuid +5fcfd6d7-1e63-3332-8826-a7eda103792d + +type +802-3-ethernet + +interface-name +-- + + +id +con-vpn-1 + +uuid +UUID-con-vpn-1-REPLACED-REPLACED-REP + +type +vpn + +interface-name +-- + +user-name +-- + +id +con-xx1 + +uuid +UUID-con-xx1-REPLACED-REPLACED-REPLA + +type +802-11-wireless + +interface-name +-- + + <<< size: 5112 -location: clients/tests/test-client.py:test_004()/407 +location: clients/tests/test-client.py:test_004()/423 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1 lang: C returncode: 0 @@ -23895,7 +24467,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN conn <<< size: 5168 -location: clients/tests/test-client.py:test_004()/408 +location: clients/tests/test-client.py:test_004()/424 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -23937,7 +24509,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połą <<< size: 5112 -location: clients/tests/test-client.py:test_004()/409 +location: clients/tests/test-client.py:test_004()/425 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1 lang: C returncode: 0 @@ -23979,7 +24551,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN conn <<< size: 5168 -location: clients/tests/test-client.py:test_004()/410 +location: clients/tests/test-client.py:test_004()/426 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -24021,7 +24593,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połą <<< size: 3768 -location: clients/tests/test-client.py:test_004()/411 +location: clients/tests/test-client.py:test_004()/427 cmd: $NMCLI --mode tabular --pretty -f ALL con s con-vpn-1 lang: C returncode: 0 @@ -24053,7 +24625,7 @@ proxy none no -- -- <<< size: 3791 -location: clients/tests/test-client.py:test_004()/412 +location: clients/tests/test-client.py:test_004()/428 cmd: $NMCLI --mode tabular --pretty -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -24085,7 +24657,7 @@ proxy none nie -- -- <<< size: 671 -location: clients/tests/test-client.py:test_004()/413 +location: clients/tests/test-client.py:test_004()/429 cmd: $NMCLI --mode tabular --pretty -f VPN con s con-vpn-1 lang: C returncode: 0 @@ -24100,7 +24672,7 @@ vpn org.freedesktop.NetworkManager.openvpn -- key1 = val1, key2 = val <<< size: 691 -location: clients/tests/test-client.py:test_004()/414 +location: clients/tests/test-client.py:test_004()/430 cmd: $NMCLI --mode tabular --pretty -f VPN con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -24115,7 +24687,7 @@ vpn org.freedesktop.NetworkManager.openvpn -- key1 = val1, key2 = val <<< size: 1131 -location: clients/tests/test-client.py:test_004()/415 +location: clients/tests/test-client.py:test_004()/431 cmd: $NMCLI --mode tabular --pretty -f GENERAL con s con-vpn-1 lang: C returncode: 0 @@ -24130,7 +24702,7 @@ GENERAL con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP wlan0 -- act <<< size: 1163 -location: clients/tests/test-client.py:test_004()/416 +location: clients/tests/test-client.py:test_004()/432 cmd: $NMCLI --mode tabular --pretty -f GENERAL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -24145,7 +24717,7 @@ GENERAL con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP wlan0 -- akt <<< size: 532 -location: clients/tests/test-client.py:test_004()/417 +location: clients/tests/test-client.py:test_004()/433 cmd: $NMCLI --mode tabular --pretty dev s lang: C returncode: 0 @@ -24164,7 +24736,7 @@ wlan1 wifi unavailable -- <<< size: 540 -location: clients/tests/test-client.py:test_004()/418 +location: clients/tests/test-client.py:test_004()/434 cmd: $NMCLI --mode tabular --pretty dev s lang: pl_PL.UTF-8 returncode: 0 @@ -24183,7 +24755,7 @@ wlan1 wifi niedostępne -- <<< size: 1728 -location: clients/tests/test-client.py:test_004()/419 +location: clients/tests/test-client.py:test_004()/435 cmd: $NMCLI --mode tabular --pretty -f all dev status lang: C returncode: 0 @@ -24202,7 +24774,7 @@ wlan1 wifi unavailable unknown unknown /org/freedesk <<< size: 1736 -location: clients/tests/test-client.py:test_004()/420 +location: clients/tests/test-client.py:test_004()/436 cmd: $NMCLI --mode tabular --pretty -f all dev status lang: pl_PL.UTF-8 returncode: 0 @@ -24221,7 +24793,7 @@ wlan1 wifi niedostępne nieznane nieznane /org/freedes <<< size: 9886 -location: clients/tests/test-client.py:test_004()/421 +location: clients/tests/test-client.py:test_004()/437 cmd: $NMCLI --mode tabular --pretty dev show lang: C returncode: 0 @@ -24432,7 +25004,7 @@ IP6 2001:a::88ca:3654:96b:ab44/89 -- dst = 2001:a::cc8b:7c09:4673:bbb0 <<< size: 10062 -location: clients/tests/test-client.py:test_004()/422 +location: clients/tests/test-client.py:test_004()/438 cmd: $NMCLI --mode tabular --pretty dev show lang: pl_PL.UTF-8 returncode: 0 @@ -24643,7 +25215,7 @@ IP6 2001:a::88ca:3654:96b:ab44/89 -- dst = 2001:a::cc8b:7c09:4673:bbb0 <<< size: 24165 -location: clients/tests/test-client.py:test_004()/423 +location: clients/tests/test-client.py:test_004()/439 cmd: $NMCLI --mode tabular --pretty -f all dev show lang: C returncode: 0 @@ -24859,7 +25431,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 24526 -location: clients/tests/test-client.py:test_004()/424 +location: clients/tests/test-client.py:test_004()/440 cmd: $NMCLI --mode tabular --pretty -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -25075,7 +25647,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 1709 -location: clients/tests/test-client.py:test_004()/425 +location: clients/tests/test-client.py:test_004()/441 cmd: $NMCLI --mode tabular --pretty dev show wlan0 lang: C returncode: 0 @@ -25122,7 +25694,7 @@ IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250 <<< size: 1749 -location: clients/tests/test-client.py:test_004()/426 +location: clients/tests/test-client.py:test_004()/442 cmd: $NMCLI --mode tabular --pretty dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -25169,7 +25741,7 @@ IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250 <<< size: 4848 -location: clients/tests/test-client.py:test_004()/427 +location: clients/tests/test-client.py:test_004()/443 cmd: $NMCLI --mode tabular --pretty -f all dev show wlan0 lang: C returncode: 0 @@ -25222,7 +25794,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 4956 -location: clients/tests/test-client.py:test_004()/428 +location: clients/tests/test-client.py:test_004()/444 cmd: $NMCLI --mode tabular --pretty -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -25275,7 +25847,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 2042 -location: clients/tests/test-client.py:test_004()/429 +location: clients/tests/test-client.py:test_004()/445 cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -25298,7 +25870,7 @@ WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown no <<< size: 2106 -location: clients/tests/test-client.py:test_004()/430 +location: clients/tests/test-client.py:test_004()/446 cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -25321,7 +25893,7 @@ WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane nie <<< size: 2042 -location: clients/tests/test-client.py:test_004()/431 +location: clients/tests/test-client.py:test_004()/447 cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -25344,7 +25916,7 @@ WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown no <<< size: 2106 -location: clients/tests/test-client.py:test_004()/432 +location: clients/tests/test-client.py:test_004()/448 cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -25367,7 +25939,7 @@ WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane nie <<< size: 681 -location: clients/tests/test-client.py:test_004()/433 +location: clients/tests/test-client.py:test_004()/449 cmd: $NMCLI --mode tabular --pretty -f DEVICE,TYPE,DBUS-PATH dev lang: C returncode: 0 @@ -25386,7 +25958,7 @@ wlan1 wifi /org/freedesktop/NetworkManager/Devices/5 <<< size: 684 -location: clients/tests/test-client.py:test_004()/434 +location: clients/tests/test-client.py:test_004()/450 cmd: $NMCLI --mode tabular --pretty -f DEVICE,TYPE,DBUS-PATH dev lang: pl_PL.UTF-8 returncode: 0 @@ -25405,7 +25977,7 @@ wlan1 wifi /org/freedesktop/NetworkManager/Devices/5 <<< size: 3036 -location: clients/tests/test-client.py:test_004()/435 +location: clients/tests/test-client.py:test_004()/451 cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list lang: C returncode: 0 @@ -25435,7 +26007,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 3274 -location: clients/tests/test-client.py:test_004()/436 +location: clients/tests/test-client.py:test_004()/452 cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -25465,7 +26037,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 1329 -location: clients/tests/test-client.py:test_004()/437 +location: clients/tests/test-client.py:test_004()/453 cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list lang: C returncode: 0 @@ -25495,7 +26067,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< size: 1559 -location: clients/tests/test-client.py:test_004()/438 +location: clients/tests/test-client.py:test_004()/454 cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -25525,7 +26097,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< size: 3149 -location: clients/tests/test-client.py:test_004()/439 +location: clients/tests/test-client.py:test_004()/455 cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: C returncode: 0 @@ -25555,7 +26127,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 3387 -location: clients/tests/test-client.py:test_004()/440 +location: clients/tests/test-client.py:test_004()/456 cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -25585,7 +26157,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 1151 -location: clients/tests/test-client.py:test_004()/441 +location: clients/tests/test-client.py:test_004()/457 cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -25602,7 +26174,7 @@ AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MH <<< size: 1239 -location: clients/tests/test-client.py:test_004()/442 +location: clients/tests/test-client.py:test_004()/458 cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -25619,7 +26191,7 @@ AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 <<< size: 566 -location: clients/tests/test-client.py:test_004()/443 +location: clients/tests/test-client.py:test_004()/459 cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -25636,7 +26208,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SEC <<< size: 651 -location: clients/tests/test-client.py:test_004()/444 +location: clients/tests/test-client.py:test_004()/460 cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -25653,7 +26225,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BA <<< size: 1264 -location: clients/tests/test-client.py:test_004()/445 +location: clients/tests/test-client.py:test_004()/461 cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -25670,7 +26242,7 @@ AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MH <<< size: 1352 -location: clients/tests/test-client.py:test_004()/446 +location: clients/tests/test-client.py:test_004()/462 cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -25687,7 +26259,7 @@ AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 <<< size: 4851 -location: clients/tests/test-client.py:test_004()/447 +location: clients/tests/test-client.py:test_004()/463 cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0 lang: C returncode: 0 @@ -25740,7 +26312,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 4959 -location: clients/tests/test-client.py:test_004()/448 +location: clients/tests/test-client.py:test_004()/464 cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -25793,7 +26365,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 1722 -location: clients/tests/test-client.py:test_004()/449 +location: clients/tests/test-client.py:test_004()/465 cmd: $NMCLI --mode tabular --pretty -f COMMON device show wlan0 lang: C returncode: 0 @@ -25840,7 +26412,7 @@ IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250 <<< size: 1762 -location: clients/tests/test-client.py:test_004()/450 +location: clients/tests/test-client.py:test_004()/466 cmd: $NMCLI --mode tabular --pretty -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -25887,7 +26459,7 @@ IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250 <<< size: 4864 -location: clients/tests/test-client.py:test_004()/451 +location: clients/tests/test-client.py:test_004()/467 cmd: $NMCLI --mode tabular --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 @@ -25936,7 +26508,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 4972 -location: clients/tests/test-client.py:test_004()/452 +location: clients/tests/test-client.py:test_004()/468 cmd: $NMCLI --mode tabular --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -25985,7 +26557,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 1526 -location: clients/tests/test-client.py:test_004()/453 +location: clients/tests/test-client.py:test_004()/469 cmd: $NMCLI --mode tabular --pretty dev lldp list ifname eth0 lang: C returncode: 0 @@ -26002,7 +26574,7 @@ eth0 00:11:22:33:44:22 port1 GigabitEthernet #3 test3.example. <<< size: 1550 -location: clients/tests/test-client.py:test_004()/454 +location: clients/tests/test-client.py:test_004()/470 cmd: $NMCLI --mode tabular --pretty dev lldp list ifname eth0 lang: pl_PL.UTF-8 returncode: 0 @@ -26017,9 +26589,151 @@ eth0 00:11:22:33:44:00 Uplink port GigabitEthernet #1 test1.example. eth0 chassis1 44:44:44:44:44:44 GigabitEthernet #2 test2.example.com Test system #2 2047 (other,repeater,mac-bridge,wlan-access-point,router,telephone,docsis-cable-device,station-only,c-vlan-component,s-vlan-component,tpmr) eth0 00:11:22:33:44:22 port1 GigabitEthernet #3 test3.example.com Test system #3 40 (wlan-access-point,telephone) +<<< +size: 1490 +location: clients/tests/test-client.py:test_004()/471 +cmd: $NMCLI --mode tabular --pretty -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: C +returncode: 0 +stdout: 1107 bytes +>>> +====================================== + Connection profile details (con-1) +====================================== +id +------- +con-1 + +uuid +-------------------------------------- +5fcfd6d7-1e63-3332-8826-a7eda103792d + +type +---------------- +802-3-ethernet + +interface-name +---------------- +-- + + +========================================== + Connection profile details (con-vpn-1) +========================================== +id +----------- +con-vpn-1 + +uuid +-------------------------------------- +UUID-con-vpn-1-REPLACED-REPLACED-REP + +type +------ +vpn + +interface-name +---------------- +-- + +user-name +----------- +-- + +======================================== + Connection profile details (con-xx1) +======================================== +id +--------- +con-xx1 + +uuid +-------------------------------------- +UUID-con-xx1-REPLACED-REPLACED-REPLA + +type +----------------- +802-11-wireless + +interface-name +---------------- +-- + + +<<< +size: 1530 +location: clients/tests/test-client.py:test_004()/472 +cmd: $NMCLI --mode tabular --pretty -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1137 bytes +>>> +======================================== + Szczegóły profilu połączenia (con-1) +======================================== +id +------- +con-1 + +uuid +-------------------------------------- +5fcfd6d7-1e63-3332-8826-a7eda103792d + +type +---------------- +802-3-ethernet + +interface-name +---------------- +-- + + +============================================ + Szczegóły profilu połączenia (con-vpn-1) +============================================ +id +----------- +con-vpn-1 + +uuid +-------------------------------------- +UUID-con-vpn-1-REPLACED-REPLACED-REP + +type +------ +vpn + +interface-name +---------------- +-- + +user-name +----------- +-- + +========================================== + Szczegóły profilu połączenia (con-xx1) +========================================== +id +--------- +con-xx1 + +uuid +-------------------------------------- +UUID-con-xx1-REPLACED-REPLACED-REPLA + +type +----------------- +802-11-wireless + +interface-name +---------------- +-- + + <<< size: 5124 -location: clients/tests/test-client.py:test_004()/455 +location: clients/tests/test-client.py:test_004()/473 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1 lang: C returncode: 0 @@ -26061,7 +26775,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN conn <<< size: 5180 -location: clients/tests/test-client.py:test_004()/456 +location: clients/tests/test-client.py:test_004()/474 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -26103,7 +26817,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połą <<< size: 5124 -location: clients/tests/test-client.py:test_004()/457 +location: clients/tests/test-client.py:test_004()/475 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1 lang: C returncode: 0 @@ -26145,7 +26859,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN conn <<< size: 5180 -location: clients/tests/test-client.py:test_004()/458 +location: clients/tests/test-client.py:test_004()/476 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -26187,7 +26901,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połą <<< size: 3780 -location: clients/tests/test-client.py:test_004()/459 +location: clients/tests/test-client.py:test_004()/477 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 @@ -26219,7 +26933,7 @@ proxy none no -- -- <<< size: 3803 -location: clients/tests/test-client.py:test_004()/460 +location: clients/tests/test-client.py:test_004()/478 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -26251,7 +26965,7 @@ proxy none nie -- -- <<< size: 683 -location: clients/tests/test-client.py:test_004()/461 +location: clients/tests/test-client.py:test_004()/479 cmd: $NMCLI --mode tabular --pretty --color yes -f VPN con s con-vpn-1 lang: C returncode: 0 @@ -26266,7 +26980,7 @@ vpn org.freedesktop.NetworkManager.openvpn -- key1 = val1, key2 = val <<< size: 703 -location: clients/tests/test-client.py:test_004()/462 +location: clients/tests/test-client.py:test_004()/480 cmd: $NMCLI --mode tabular --pretty --color yes -f VPN con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -26281,7 +26995,7 @@ vpn org.freedesktop.NetworkManager.openvpn -- key1 = val1, key2 = val <<< size: 1143 -location: clients/tests/test-client.py:test_004()/463 +location: clients/tests/test-client.py:test_004()/481 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL con s con-vpn-1 lang: C returncode: 0 @@ -26296,7 +27010,7 @@ GENERAL con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP wlan0 -- act <<< size: 1175 -location: clients/tests/test-client.py:test_004()/464 +location: clients/tests/test-client.py:test_004()/482 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -26311,7 +27025,7 @@ GENERAL con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP wlan0 -- akt <<< size: 704 -location: clients/tests/test-client.py:test_004()/465 +location: clients/tests/test-client.py:test_004()/483 cmd: $NMCLI --mode tabular --pretty --color yes dev s lang: C returncode: 0 @@ -26330,7 +27044,7 @@ DEVICE TYPE STATE CONNECTION <<< size: 712 -location: clients/tests/test-client.py:test_004()/466 +location: clients/tests/test-client.py:test_004()/484 cmd: $NMCLI --mode tabular --pretty --color yes dev s lang: pl_PL.UTF-8 returncode: 0 @@ -26349,7 +27063,7 @@ DEVICE TYPE STATE CONNECTION <<< size: 2100 -location: clients/tests/test-client.py:test_004()/467 +location: clients/tests/test-client.py:test_004()/485 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev status lang: C returncode: 0 @@ -26368,7 +27082,7 @@ DEVICE TYPE STATE IP4-CONNECTIVITY IP6-CONNECTIVITY DBUS-PATH <<< size: 2108 -location: clients/tests/test-client.py:test_004()/468 +location: clients/tests/test-client.py:test_004()/486 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev status lang: pl_PL.UTF-8 returncode: 0 @@ -26387,7 +27101,7 @@ DEVICE TYPE STATE IP4-CONNECTIVITY IP6-CONNECTIVITY DBUS-PATH <<< size: 9898 -location: clients/tests/test-client.py:test_004()/469 +location: clients/tests/test-client.py:test_004()/487 cmd: $NMCLI --mode tabular --pretty --color yes dev show lang: C returncode: 0 @@ -26598,7 +27312,7 @@ IP6 2001:a::88ca:3654:96b:ab44/89 -- dst = 2001:a::cc8b:7c09:4673:bbb0 <<< size: 10074 -location: clients/tests/test-client.py:test_004()/470 +location: clients/tests/test-client.py:test_004()/488 cmd: $NMCLI --mode tabular --pretty --color yes dev show lang: pl_PL.UTF-8 returncode: 0 @@ -26809,7 +27523,7 @@ IP6 2001:a::88ca:3654:96b:ab44/89 -- dst = 2001:a::cc8b:7c09:4673:bbb0 <<< size: 24537 -location: clients/tests/test-client.py:test_004()/471 +location: clients/tests/test-client.py:test_004()/489 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show lang: C returncode: 0 @@ -27025,7 +27739,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 24898 -location: clients/tests/test-client.py:test_004()/472 +location: clients/tests/test-client.py:test_004()/490 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -27241,7 +27955,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 1721 -location: clients/tests/test-client.py:test_004()/473 +location: clients/tests/test-client.py:test_004()/491 cmd: $NMCLI --mode tabular --pretty --color yes dev show wlan0 lang: C returncode: 0 @@ -27288,7 +28002,7 @@ IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250 <<< size: 1761 -location: clients/tests/test-client.py:test_004()/474 +location: clients/tests/test-client.py:test_004()/492 cmd: $NMCLI --mode tabular --pretty --color yes dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -27335,7 +28049,7 @@ IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250 <<< size: 5130 -location: clients/tests/test-client.py:test_004()/475 +location: clients/tests/test-client.py:test_004()/493 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show wlan0 lang: C returncode: 0 @@ -27388,7 +28102,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 5238 -location: clients/tests/test-client.py:test_004()/476 +location: clients/tests/test-client.py:test_004()/494 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -27441,7 +28155,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 2054 -location: clients/tests/test-client.py:test_004()/477 +location: clients/tests/test-client.py:test_004()/495 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -27464,7 +28178,7 @@ WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown no <<< size: 2118 -location: clients/tests/test-client.py:test_004()/478 +location: clients/tests/test-client.py:test_004()/496 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -27487,7 +28201,7 @@ WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane nie <<< size: 2054 -location: clients/tests/test-client.py:test_004()/479 +location: clients/tests/test-client.py:test_004()/497 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -27510,7 +28224,7 @@ WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown no <<< size: 2118 -location: clients/tests/test-client.py:test_004()/480 +location: clients/tests/test-client.py:test_004()/498 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -27533,7 +28247,7 @@ WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane nie <<< size: 813 -location: clients/tests/test-client.py:test_004()/481 +location: clients/tests/test-client.py:test_004()/499 cmd: $NMCLI --mode tabular --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev lang: C returncode: 0 @@ -27552,7 +28266,7 @@ DEVICE TYPE DBUS-PATH <<< size: 816 -location: clients/tests/test-client.py:test_004()/482 +location: clients/tests/test-client.py:test_004()/500 cmd: $NMCLI --mode tabular --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev lang: pl_PL.UTF-8 returncode: 0 @@ -27571,7 +28285,7 @@ DEVICE TYPE DBUS-PATH <<< size: 3660 -location: clients/tests/test-client.py:test_004()/483 +location: clients/tests/test-client.py:test_004()/501 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list lang: C returncode: 0 @@ -27601,7 +28315,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 3898 -location: clients/tests/test-client.py:test_004()/484 +location: clients/tests/test-client.py:test_004()/502 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -27631,7 +28345,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 1665 -location: clients/tests/test-client.py:test_004()/485 +location: clients/tests/test-client.py:test_004()/503 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list lang: C returncode: 0 @@ -27661,7 +28375,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< size: 1895 -location: clients/tests/test-client.py:test_004()/486 +location: clients/tests/test-client.py:test_004()/504 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -27691,7 +28405,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< size: 3773 -location: clients/tests/test-client.py:test_004()/487 +location: clients/tests/test-client.py:test_004()/505 cmd: $NMCLI --mode tabular --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: C returncode: 0 @@ -27721,7 +28435,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 4011 -location: clients/tests/test-client.py:test_004()/488 +location: clients/tests/test-client.py:test_004()/506 cmd: $NMCLI --mode tabular --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -27751,7 +28465,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA <<< size: 1317 -location: clients/tests/test-client.py:test_004()/489 +location: clients/tests/test-client.py:test_004()/507 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -27768,7 +28482,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ <<< size: 1404 -location: clients/tests/test-client.py:test_004()/490 +location: clients/tests/test-client.py:test_004()/508 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -27785,7 +28499,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN <<< size: 659 -location: clients/tests/test-client.py:test_004()/491 +location: clients/tests/test-client.py:test_004()/509 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -27802,7 +28516,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BARS SEC <<< size: 744 -location: clients/tests/test-client.py:test_004()/492 +location: clients/tests/test-client.py:test_004()/510 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -27819,7 +28533,7 @@ IN-USE BSSID SSID MODE CHAN RATE SIGNAL BA <<< size: 1430 -location: clients/tests/test-client.py:test_004()/493 +location: clients/tests/test-client.py:test_004()/511 cmd: $NMCLI --mode tabular --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -27836,7 +28550,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ <<< size: 1517 -location: clients/tests/test-client.py:test_004()/494 +location: clients/tests/test-client.py:test_004()/512 cmd: $NMCLI --mode tabular --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -27853,7 +28567,7 @@ NAME SSID SSID-HEX BSSID MODE CHAN <<< size: 5133 -location: clients/tests/test-client.py:test_004()/495 +location: clients/tests/test-client.py:test_004()/513 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device show wlan0 lang: C returncode: 0 @@ -27906,7 +28620,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 5241 -location: clients/tests/test-client.py:test_004()/496 +location: clients/tests/test-client.py:test_004()/514 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -27959,7 +28673,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 1734 -location: clients/tests/test-client.py:test_004()/497 +location: clients/tests/test-client.py:test_004()/515 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device show wlan0 lang: C returncode: 0 @@ -28006,7 +28720,7 @@ IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250 <<< size: 1774 -location: clients/tests/test-client.py:test_004()/498 +location: clients/tests/test-client.py:test_004()/516 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -28053,7 +28767,7 @@ IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250 <<< size: 5146 -location: clients/tests/test-client.py:test_004()/499 +location: clients/tests/test-client.py:test_004()/517 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 @@ -28102,7 +28816,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 5254 -location: clients/tests/test-client.py:test_004()/500 +location: clients/tests/test-client.py:test_004()/518 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -28151,7 +28865,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-x <<< size: 1538 -location: clients/tests/test-client.py:test_004()/501 +location: clients/tests/test-client.py:test_004()/519 cmd: $NMCLI --mode tabular --pretty --color yes dev lldp list ifname eth0 lang: C returncode: 0 @@ -28168,7 +28882,7 @@ eth0 00:11:22:33:44:22 port1 GigabitEthernet #3 test3.example. <<< size: 1562 -location: clients/tests/test-client.py:test_004()/502 +location: clients/tests/test-client.py:test_004()/520 cmd: $NMCLI --mode tabular --pretty --color yes dev lldp list ifname eth0 lang: pl_PL.UTF-8 returncode: 0 @@ -28183,9 +28897,151 @@ eth0 00:11:22:33:44:00 Uplink port GigabitEthernet #1 test1.example. eth0 chassis1 44:44:44:44:44:44 GigabitEthernet #2 test2.example.com Test system #2 2047 (other,repeater,mac-bridge,wlan-access-point,router,telephone,docsis-cable-device,station-only,c-vlan-component,s-vlan-component,tpmr) eth0 00:11:22:33:44:22 port1 GigabitEthernet #3 test3.example.com Test system #3 40 (wlan-access-point,telephone) +<<< +size: 1502 +location: clients/tests/test-client.py:test_004()/521 +cmd: $NMCLI --mode tabular --pretty --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: C +returncode: 0 +stdout: 1107 bytes +>>> +====================================== + Connection profile details (con-1) +====================================== +id +------- +con-1 + +uuid +-------------------------------------- +5fcfd6d7-1e63-3332-8826-a7eda103792d + +type +---------------- +802-3-ethernet + +interface-name +---------------- +-- + + +========================================== + Connection profile details (con-vpn-1) +========================================== +id +----------- +con-vpn-1 + +uuid +-------------------------------------- +UUID-con-vpn-1-REPLACED-REPLACED-REP + +type +------ +vpn + +interface-name +---------------- +-- + +user-name +----------- +-- + +======================================== + Connection profile details (con-xx1) +======================================== +id +--------- +con-xx1 + +uuid +-------------------------------------- +UUID-con-xx1-REPLACED-REPLACED-REPLA + +type +----------------- +802-11-wireless + +interface-name +---------------- +-- + + +<<< +size: 1542 +location: clients/tests/test-client.py:test_004()/522 +cmd: $NMCLI --mode tabular --pretty --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1137 bytes +>>> +======================================== + Szczegóły profilu połączenia (con-1) +======================================== +id +------- +con-1 + +uuid +-------------------------------------- +5fcfd6d7-1e63-3332-8826-a7eda103792d + +type +---------------- +802-3-ethernet + +interface-name +---------------- +-- + + +============================================ + Szczegóły profilu połączenia (con-vpn-1) +============================================ +id +----------- +con-vpn-1 + +uuid +-------------------------------------- +UUID-con-vpn-1-REPLACED-REPLACED-REP + +type +------ +vpn + +interface-name +---------------- +-- + +user-name +----------- +-- + +========================================== + Szczegóły profilu połączenia (con-xx1) +========================================== +id +--------- +con-xx1 + +uuid +-------------------------------------- +UUID-con-xx1-REPLACED-REPLACED-REPLA + +type +----------------- +802-11-wireless + +interface-name +---------------- +-- + + <<< size: 800 -location: clients/tests/test-client.py:test_004()/503 +location: clients/tests/test-client.py:test_004()/523 cmd: $NMCLI --mode tabular --terse con s con-vpn-1 lang: C returncode: 0 @@ -28201,7 +29057,7 @@ VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | k <<< size: 810 -location: clients/tests/test-client.py:test_004()/504 +location: clients/tests/test-client.py:test_004()/524 cmd: $NMCLI --mode tabular --terse con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -28217,7 +29073,7 @@ VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | k <<< size: 800 -location: clients/tests/test-client.py:test_004()/505 +location: clients/tests/test-client.py:test_004()/525 cmd: $NMCLI --mode tabular --terse con s con-vpn-1 lang: C returncode: 0 @@ -28233,7 +29089,7 @@ VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | k <<< size: 810 -location: clients/tests/test-client.py:test_004()/506 +location: clients/tests/test-client.py:test_004()/526 cmd: $NMCLI --mode tabular --terse con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -28249,7 +29105,7 @@ VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | k <<< size: 512 -location: clients/tests/test-client.py:test_004()/507 +location: clients/tests/test-client.py:test_004()/527 cmd: $NMCLI --mode tabular --terse -f ALL con s con-vpn-1 lang: C returncode: 0 @@ -28263,7 +29119,7 @@ proxy:none:no:: <<< size: 522 -location: clients/tests/test-client.py:test_004()/508 +location: clients/tests/test-client.py:test_004()/528 cmd: $NMCLI --mode tabular --terse -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -28277,7 +29133,7 @@ proxy:none:no:: <<< size: 256 -location: clients/tests/test-client.py:test_004()/509 +location: clients/tests/test-client.py:test_004()/529 cmd: $NMCLI --mode tabular --terse -f VPN con s con-vpn-1 lang: C returncode: 0 @@ -28287,7 +29143,7 @@ vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val <<< size: 266 -location: clients/tests/test-client.py:test_004()/510 +location: clients/tests/test-client.py:test_004()/530 cmd: $NMCLI --mode tabular --terse -f VPN con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -28297,7 +29153,7 @@ vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val <<< size: 355 -location: clients/tests/test-client.py:test_004()/511 +location: clients/tests/test-client.py:test_004()/531 cmd: $NMCLI --mode tabular --terse -f GENERAL con s con-vpn-1 lang: C returncode: 0 @@ -28307,7 +29163,7 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y <<< size: 365 -location: clients/tests/test-client.py:test_004()/512 +location: clients/tests/test-client.py:test_004()/532 cmd: $NMCLI --mode tabular --terse -f GENERAL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -28317,7 +29173,7 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y <<< size: 279 -location: clients/tests/test-client.py:test_004()/513 +location: clients/tests/test-client.py:test_004()/533 cmd: $NMCLI --mode tabular --terse dev s lang: C returncode: 0 @@ -28331,7 +29187,7 @@ wlan1:wifi:unavailable: <<< size: 289 -location: clients/tests/test-client.py:test_004()/514 +location: clients/tests/test-client.py:test_004()/534 cmd: $NMCLI --mode tabular --terse dev s lang: pl_PL.UTF-8 returncode: 0 @@ -28345,7 +29201,7 @@ wlan1:wifi:unavailable: <<< size: 677 -location: clients/tests/test-client.py:test_004()/515 +location: clients/tests/test-client.py:test_004()/535 cmd: $NMCLI --mode tabular --terse -f all dev status lang: C returncode: 0 @@ -28359,7 +29215,7 @@ wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5 <<< size: 687 -location: clients/tests/test-client.py:test_004()/516 +location: clients/tests/test-client.py:test_004()/536 cmd: $NMCLI --mode tabular --terse -f all dev status lang: pl_PL.UTF-8 returncode: 0 @@ -28373,7 +29229,7 @@ wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5 <<< size: 3091 -location: clients/tests/test-client.py:test_004()/517 +location: clients/tests/test-client.py:test_004()/537 cmd: $NMCLI --mode tabular --terse dev show lang: C returncode: 0 @@ -28433,7 +29289,7 @@ IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0 <<< size: 3101 -location: clients/tests/test-client.py:test_004()/518 +location: clients/tests/test-client.py:test_004()/538 cmd: $NMCLI --mode tabular --terse dev show lang: pl_PL.UTF-8 returncode: 0 @@ -28493,7 +29349,7 @@ IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0 <<< size: 6765 -location: clients/tests/test-client.py:test_004()/519 +location: clients/tests/test-client.py:test_004()/539 cmd: $NMCLI --mode tabular --terse -f all dev show lang: C returncode: 0 @@ -28555,7 +29411,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1 <<< size: 6811 -location: clients/tests/test-client.py:test_004()/520 +location: clients/tests/test-client.py:test_004()/540 cmd: $NMCLI --mode tabular --terse -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -28617,7 +29473,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1 <<< size: 599 -location: clients/tests/test-client.py:test_004()/521 +location: clients/tests/test-client.py:test_004()/541 cmd: $NMCLI --mode tabular --terse dev show wlan0 lang: C returncode: 0 @@ -28635,7 +29491,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se <<< size: 609 -location: clients/tests/test-client.py:test_004()/522 +location: clients/tests/test-client.py:test_004()/542 cmd: $NMCLI --mode tabular --terse dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -28653,7 +29509,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se <<< size: 1494 -location: clients/tests/test-client.py:test_004()/523 +location: clients/tests/test-client.py:test_004()/543 cmd: $NMCLI --mode tabular --terse -f all dev show wlan0 lang: C returncode: 0 @@ -28674,7 +29530,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1 <<< size: 1531 -location: clients/tests/test-client.py:test_004()/524 +location: clients/tests/test-client.py:test_004()/544 cmd: $NMCLI --mode tabular --terse -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -28695,7 +29551,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1 <<< size: 608 -location: clients/tests/test-client.py:test_004()/525 +location: clients/tests/test-client.py:test_004()/545 cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -28707,7 +29563,7 @@ WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no <<< size: 618 -location: clients/tests/test-client.py:test_004()/526 +location: clients/tests/test-client.py:test_004()/546 cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -28719,7 +29575,7 @@ WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no <<< size: 608 -location: clients/tests/test-client.py:test_004()/527 +location: clients/tests/test-client.py:test_004()/547 cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -28731,7 +29587,7 @@ WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no <<< size: 618 -location: clients/tests/test-client.py:test_004()/528 +location: clients/tests/test-client.py:test_004()/548 cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -28743,7 +29599,7 @@ WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no <<< size: 438 -location: clients/tests/test-client.py:test_004()/529 +location: clients/tests/test-client.py:test_004()/549 cmd: $NMCLI --mode tabular --terse -f DEVICE,TYPE,DBUS-PATH dev lang: C returncode: 0 @@ -28757,7 +29613,7 @@ wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5 <<< size: 448 -location: clients/tests/test-client.py:test_004()/530 +location: clients/tests/test-client.py:test_004()/550 cmd: $NMCLI --mode tabular --terse -f DEVICE,TYPE,DBUS-PATH dev lang: pl_PL.UTF-8 returncode: 0 @@ -28771,7 +29627,7 @@ wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5 <<< size: 1096 -location: clients/tests/test-client.py:test_004()/531 +location: clients/tests/test-client.py:test_004()/551 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list lang: C returncode: 0 @@ -28786,7 +29642,7 @@ AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 <<< size: 1154 -location: clients/tests/test-client.py:test_004()/532 +location: clients/tests/test-client.py:test_004()/552 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -28801,7 +29657,7 @@ AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:24 <<< size: 445 -location: clients/tests/test-client.py:test_004()/533 +location: clients/tests/test-client.py:test_004()/553 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list lang: C returncode: 0 @@ -28816,7 +29672,7 @@ stdout: 280 bytes <<< size: 491 -location: clients/tests/test-client.py:test_004()/534 +location: clients/tests/test-client.py:test_004()/554 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -28831,7 +29687,7 @@ stdout: 316 bytes <<< size: 1209 -location: clients/tests/test-client.py:test_004()/535 +location: clients/tests/test-client.py:test_004()/555 cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: C returncode: 0 @@ -28846,7 +29702,7 @@ AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 <<< size: 1267 -location: clients/tests/test-client.py:test_004()/536 +location: clients/tests/test-client.py:test_004()/556 cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -28861,7 +29717,7 @@ AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:24 <<< size: 443 -location: clients/tests/test-client.py:test_004()/537 +location: clients/tests/test-client.py:test_004()/557 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -28873,7 +29729,7 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 <<< size: 465 -location: clients/tests/test-client.py:test_004()/538 +location: clients/tests/test-client.py:test_004()/558 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -28885,7 +29741,7 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:24 <<< size: 262 -location: clients/tests/test-client.py:test_004()/539 +location: clients/tests/test-client.py:test_004()/559 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -28897,7 +29753,7 @@ stdout: 74 bytes <<< size: 281 -location: clients/tests/test-client.py:test_004()/540 +location: clients/tests/test-client.py:test_004()/560 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -28909,7 +29765,7 @@ stdout: 83 bytes <<< size: 556 -location: clients/tests/test-client.py:test_004()/541 +location: clients/tests/test-client.py:test_004()/561 cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -28921,7 +29777,7 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 <<< size: 578 -location: clients/tests/test-client.py:test_004()/542 +location: clients/tests/test-client.py:test_004()/562 cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -28933,7 +29789,7 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:24 <<< size: 1497 -location: clients/tests/test-client.py:test_004()/543 +location: clients/tests/test-client.py:test_004()/563 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0 lang: C returncode: 0 @@ -28954,7 +29810,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1 <<< size: 1534 -location: clients/tests/test-client.py:test_004()/544 +location: clients/tests/test-client.py:test_004()/564 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -28975,7 +29831,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1 <<< size: 612 -location: clients/tests/test-client.py:test_004()/545 +location: clients/tests/test-client.py:test_004()/565 cmd: $NMCLI --mode tabular --terse -f COMMON device show wlan0 lang: C returncode: 0 @@ -28993,7 +29849,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se <<< size: 622 -location: clients/tests/test-client.py:test_004()/546 +location: clients/tests/test-client.py:test_004()/566 cmd: $NMCLI --mode tabular --terse -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -29011,7 +29867,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se <<< size: 1608 -location: clients/tests/test-client.py:test_004()/547 +location: clients/tests/test-client.py:test_004()/567 cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 @@ -29031,7 +29887,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1 <<< size: 1645 -location: clients/tests/test-client.py:test_004()/548 +location: clients/tests/test-client.py:test_004()/568 cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -29051,7 +29907,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1 <<< size: 627 -location: clients/tests/test-client.py:test_004()/549 +location: clients/tests/test-client.py:test_004()/569 cmd: $NMCLI --mode tabular --terse dev lldp list ifname eth0 lang: C returncode: 0 @@ -29063,7 +29919,7 @@ eth0:00\:11\:22\:33\:44\:22:port1:GigabitEthernet #3:test3.example.com:Test syst <<< size: 637 -location: clients/tests/test-client.py:test_004()/550 +location: clients/tests/test-client.py:test_004()/570 cmd: $NMCLI --mode tabular --terse dev lldp list ifname eth0 lang: pl_PL.UTF-8 returncode: 0 @@ -29073,9 +29929,57 @@ eth0:00\:11\:22\:33\:44\:00:Uplink port:GigabitEthernet #1:test1.example.com:Tes eth0:chassis1:44\:44\:44\:44\:44\:44:GigabitEthernet #2:test2.example.com:Test system #2:2047 (other,repeater,mac-bridge,wlan-access-point,router,telephone,docsis-cable-device,station-only,c-vlan-component,s-vlan-component,tpmr) eth0:00\:11\:22\:33\:44\:22:port1:GigabitEthernet #3:test3.example.com:Test system #3:40 (wlan-access-point,telephone) +<<< +size: 557 +location: clients/tests/test-client.py:test_004()/571 +cmd: $NMCLI --mode tabular --terse -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: C +returncode: 0 +stdout: 176 bytes +>>> +con-1 +5fcfd6d7-1e63-3332-8826-a7eda103792d +802-3-ethernet + + +con-vpn-1 +UUID-con-vpn-1-REPLACED-REPLACED-REP +vpn + + + +con-xx1 +UUID-con-xx1-REPLACED-REPLACED-REPLA +802-11-wireless + + +<<< +size: 567 +location: clients/tests/test-client.py:test_004()/572 +cmd: $NMCLI --mode tabular --terse -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 176 bytes +>>> +con-1 +5fcfd6d7-1e63-3332-8826-a7eda103792d +802-3-ethernet + + +con-vpn-1 +UUID-con-vpn-1-REPLACED-REPLACED-REP +vpn + + + +con-xx1 +UUID-con-xx1-REPLACED-REPLACED-REPLA +802-11-wireless + + <<< size: 812 -location: clients/tests/test-client.py:test_004()/551 +location: clients/tests/test-client.py:test_004()/573 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1 lang: C returncode: 0 @@ -29091,7 +29995,7 @@ VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | k <<< size: 822 -location: clients/tests/test-client.py:test_004()/552 +location: clients/tests/test-client.py:test_004()/574 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -29107,7 +30011,7 @@ VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | k <<< size: 812 -location: clients/tests/test-client.py:test_004()/553 +location: clients/tests/test-client.py:test_004()/575 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1 lang: C returncode: 0 @@ -29123,7 +30027,7 @@ VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | k <<< size: 822 -location: clients/tests/test-client.py:test_004()/554 +location: clients/tests/test-client.py:test_004()/576 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -29139,7 +30043,7 @@ VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | k <<< size: 524 -location: clients/tests/test-client.py:test_004()/555 +location: clients/tests/test-client.py:test_004()/577 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 @@ -29153,7 +30057,7 @@ proxy:none:no:: <<< size: 534 -location: clients/tests/test-client.py:test_004()/556 +location: clients/tests/test-client.py:test_004()/578 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -29167,7 +30071,7 @@ proxy:none:no:: <<< size: 268 -location: clients/tests/test-client.py:test_004()/557 +location: clients/tests/test-client.py:test_004()/579 cmd: $NMCLI --mode tabular --terse --color yes -f VPN con s con-vpn-1 lang: C returncode: 0 @@ -29177,7 +30081,7 @@ vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val <<< size: 278 -location: clients/tests/test-client.py:test_004()/558 +location: clients/tests/test-client.py:test_004()/580 cmd: $NMCLI --mode tabular --terse --color yes -f VPN con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -29187,7 +30091,7 @@ vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val <<< size: 367 -location: clients/tests/test-client.py:test_004()/559 +location: clients/tests/test-client.py:test_004()/581 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL con s con-vpn-1 lang: C returncode: 0 @@ -29197,7 +30101,7 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y <<< size: 377 -location: clients/tests/test-client.py:test_004()/560 +location: clients/tests/test-client.py:test_004()/582 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -29207,7 +30111,7 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y <<< size: 451 -location: clients/tests/test-client.py:test_004()/561 +location: clients/tests/test-client.py:test_004()/583 cmd: $NMCLI --mode tabular --terse --color yes dev s lang: C returncode: 0 @@ -29221,7 +30125,7 @@ stdout: 295 bytes <<< size: 461 -location: clients/tests/test-client.py:test_004()/562 +location: clients/tests/test-client.py:test_004()/584 cmd: $NMCLI --mode tabular --terse --color yes dev s lang: pl_PL.UTF-8 returncode: 0 @@ -29235,7 +30139,7 @@ stdout: 295 bytes <<< size: 1049 -location: clients/tests/test-client.py:test_004()/563 +location: clients/tests/test-client.py:test_004()/585 cmd: $NMCLI --mode tabular --terse --color yes -f all dev status lang: C returncode: 0 @@ -29249,7 +30153,7 @@ stdout: 881 bytes <<< size: 1059 -location: clients/tests/test-client.py:test_004()/564 +location: clients/tests/test-client.py:test_004()/586 cmd: $NMCLI --mode tabular --terse --color yes -f all dev status lang: pl_PL.UTF-8 returncode: 0 @@ -29263,7 +30167,7 @@ stdout: 881 bytes <<< size: 3103 -location: clients/tests/test-client.py:test_004()/565 +location: clients/tests/test-client.py:test_004()/587 cmd: $NMCLI --mode tabular --terse --color yes dev show lang: C returncode: 0 @@ -29323,7 +30227,7 @@ IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0 <<< size: 3113 -location: clients/tests/test-client.py:test_004()/566 +location: clients/tests/test-client.py:test_004()/588 cmd: $NMCLI --mode tabular --terse --color yes dev show lang: pl_PL.UTF-8 returncode: 0 @@ -29383,7 +30287,7 @@ IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0 <<< size: 7137 -location: clients/tests/test-client.py:test_004()/567 +location: clients/tests/test-client.py:test_004()/589 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show lang: C returncode: 0 @@ -29445,7 +30349,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1 <<< size: 7183 -location: clients/tests/test-client.py:test_004()/568 +location: clients/tests/test-client.py:test_004()/590 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -29507,7 +30411,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1 <<< size: 611 -location: clients/tests/test-client.py:test_004()/569 +location: clients/tests/test-client.py:test_004()/591 cmd: $NMCLI --mode tabular --terse --color yes dev show wlan0 lang: C returncode: 0 @@ -29525,7 +30429,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se <<< size: 621 -location: clients/tests/test-client.py:test_004()/570 +location: clients/tests/test-client.py:test_004()/592 cmd: $NMCLI --mode tabular --terse --color yes dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -29543,7 +30447,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se <<< size: 1776 -location: clients/tests/test-client.py:test_004()/571 +location: clients/tests/test-client.py:test_004()/593 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show wlan0 lang: C returncode: 0 @@ -29564,7 +30468,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1 <<< size: 1813 -location: clients/tests/test-client.py:test_004()/572 +location: clients/tests/test-client.py:test_004()/594 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -29585,7 +30489,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1 <<< size: 620 -location: clients/tests/test-client.py:test_004()/573 +location: clients/tests/test-client.py:test_004()/595 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -29597,7 +30501,7 @@ WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no <<< size: 630 -location: clients/tests/test-client.py:test_004()/574 +location: clients/tests/test-client.py:test_004()/596 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -29609,7 +30513,7 @@ WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no <<< size: 620 -location: clients/tests/test-client.py:test_004()/575 +location: clients/tests/test-client.py:test_004()/597 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -29621,7 +30525,7 @@ WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no <<< size: 630 -location: clients/tests/test-client.py:test_004()/576 +location: clients/tests/test-client.py:test_004()/598 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -29633,7 +30537,7 @@ WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no <<< size: 570 -location: clients/tests/test-client.py:test_004()/577 +location: clients/tests/test-client.py:test_004()/599 cmd: $NMCLI --mode tabular --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev lang: C returncode: 0 @@ -29647,7 +30551,7 @@ stdout: 391 bytes <<< size: 580 -location: clients/tests/test-client.py:test_004()/578 +location: clients/tests/test-client.py:test_004()/600 cmd: $NMCLI --mode tabular --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev lang: pl_PL.UTF-8 returncode: 0 @@ -29661,7 +30565,7 @@ stdout: 391 bytes <<< size: 1721 -location: clients/tests/test-client.py:test_004()/579 +location: clients/tests/test-client.py:test_004()/601 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list lang: C returncode: 0 @@ -29676,7 +30580,7 @@ stdout: 1546 bytes <<< size: 1779 -location: clients/tests/test-client.py:test_004()/580 +location: clients/tests/test-client.py:test_004()/602 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -29691,7 +30595,7 @@ stdout: 1594 bytes <<< size: 781 -location: clients/tests/test-client.py:test_004()/581 +location: clients/tests/test-client.py:test_004()/603 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list lang: C returncode: 0 @@ -29706,7 +30610,7 @@ stdout: 604 bytes <<< size: 827 -location: clients/tests/test-client.py:test_004()/582 +location: clients/tests/test-client.py:test_004()/604 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -29721,7 +30625,7 @@ stdout: 640 bytes <<< size: 1834 -location: clients/tests/test-client.py:test_004()/583 +location: clients/tests/test-client.py:test_004()/605 cmd: $NMCLI --mode tabular --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: C returncode: 0 @@ -29736,7 +30640,7 @@ stdout: 1546 bytes <<< size: 1892 -location: clients/tests/test-client.py:test_004()/584 +location: clients/tests/test-client.py:test_004()/606 cmd: $NMCLI --mode tabular --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -29751,7 +30655,7 @@ stdout: 1594 bytes <<< size: 608 -location: clients/tests/test-client.py:test_004()/585 +location: clients/tests/test-client.py:test_004()/607 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -29763,7 +30667,7 @@ stdout: 410 bytes <<< size: 630 -location: clients/tests/test-client.py:test_004()/586 +location: clients/tests/test-client.py:test_004()/608 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -29775,7 +30679,7 @@ stdout: 422 bytes <<< size: 356 -location: clients/tests/test-client.py:test_004()/587 +location: clients/tests/test-client.py:test_004()/609 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -29787,7 +30691,7 @@ stdout: 155 bytes <<< size: 375 -location: clients/tests/test-client.py:test_004()/588 +location: clients/tests/test-client.py:test_004()/610 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -29799,7 +30703,7 @@ stdout: 164 bytes <<< size: 721 -location: clients/tests/test-client.py:test_004()/589 +location: clients/tests/test-client.py:test_004()/611 cmd: $NMCLI --mode tabular --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -29811,7 +30715,7 @@ stdout: 410 bytes <<< size: 743 -location: clients/tests/test-client.py:test_004()/590 +location: clients/tests/test-client.py:test_004()/612 cmd: $NMCLI --mode tabular --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -29823,7 +30727,7 @@ stdout: 422 bytes <<< size: 1779 -location: clients/tests/test-client.py:test_004()/591 +location: clients/tests/test-client.py:test_004()/613 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0 lang: C returncode: 0 @@ -29844,7 +30748,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1 <<< size: 1816 -location: clients/tests/test-client.py:test_004()/592 +location: clients/tests/test-client.py:test_004()/614 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -29865,7 +30769,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1 <<< size: 624 -location: clients/tests/test-client.py:test_004()/593 +location: clients/tests/test-client.py:test_004()/615 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device show wlan0 lang: C returncode: 0 @@ -29883,7 +30787,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se <<< size: 634 -location: clients/tests/test-client.py:test_004()/594 +location: clients/tests/test-client.py:test_004()/616 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -29901,7 +30805,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se <<< size: 1890 -location: clients/tests/test-client.py:test_004()/595 +location: clients/tests/test-client.py:test_004()/617 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 @@ -29921,7 +30825,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1 <<< size: 1927 -location: clients/tests/test-client.py:test_004()/596 +location: clients/tests/test-client.py:test_004()/618 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -29941,7 +30845,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1 <<< size: 639 -location: clients/tests/test-client.py:test_004()/597 +location: clients/tests/test-client.py:test_004()/619 cmd: $NMCLI --mode tabular --terse --color yes dev lldp list ifname eth0 lang: C returncode: 0 @@ -29953,7 +30857,7 @@ eth0:00\:11\:22\:33\:44\:22:port1:GigabitEthernet #3:test3.example.com:Test syst <<< size: 649 -location: clients/tests/test-client.py:test_004()/598 +location: clients/tests/test-client.py:test_004()/620 cmd: $NMCLI --mode tabular --terse --color yes dev lldp list ifname eth0 lang: pl_PL.UTF-8 returncode: 0 @@ -29963,9 +30867,57 @@ eth0:00\:11\:22\:33\:44\:00:Uplink port:GigabitEthernet #1:test1.example.com:Tes eth0:chassis1:44\:44\:44\:44\:44\:44:GigabitEthernet #2:test2.example.com:Test system #2:2047 (other,repeater,mac-bridge,wlan-access-point,router,telephone,docsis-cable-device,station-only,c-vlan-component,s-vlan-component,tpmr) eth0:00\:11\:22\:33\:44\:22:port1:GigabitEthernet #3:test3.example.com:Test system #3:40 (wlan-access-point,telephone) +<<< +size: 569 +location: clients/tests/test-client.py:test_004()/621 +cmd: $NMCLI --mode tabular --terse --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: C +returncode: 0 +stdout: 176 bytes +>>> +con-1 +5fcfd6d7-1e63-3332-8826-a7eda103792d +802-3-ethernet + + +con-vpn-1 +UUID-con-vpn-1-REPLACED-REPLACED-REP +vpn + + + +con-xx1 +UUID-con-xx1-REPLACED-REPLACED-REPLA +802-11-wireless + + +<<< +size: 579 +location: clients/tests/test-client.py:test_004()/622 +cmd: $NMCLI --mode tabular --terse --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 176 bytes +>>> +con-1 +5fcfd6d7-1e63-3332-8826-a7eda103792d +802-3-ethernet + + +con-vpn-1 +UUID-con-vpn-1-REPLACED-REPLACED-REP +vpn + + + +con-xx1 +UUID-con-xx1-REPLACED-REPLACED-REPLA +802-11-wireless + + <<< size: 4976 -location: clients/tests/test-client.py:test_004()/599 +location: clients/tests/test-client.py:test_004()/623 cmd: $NMCLI --mode multiline con s con-vpn-1 lang: C returncode: 0 @@ -30075,7 +31027,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 5006 -location: clients/tests/test-client.py:test_004()/600 +location: clients/tests/test-client.py:test_004()/624 cmd: $NMCLI --mode multiline con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -30185,7 +31137,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 4976 -location: clients/tests/test-client.py:test_004()/601 +location: clients/tests/test-client.py:test_004()/625 cmd: $NMCLI --mode multiline con s con-vpn-1 lang: C returncode: 0 @@ -30295,7 +31247,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 5006 -location: clients/tests/test-client.py:test_004()/602 +location: clients/tests/test-client.py:test_004()/626 cmd: $NMCLI --mode multiline con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -30405,7 +31357,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 3852 -location: clients/tests/test-client.py:test_004()/603 +location: clients/tests/test-client.py:test_004()/627 cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1 lang: C returncode: 0 @@ -30494,7 +31446,7 @@ proxy.pac-script: -- <<< size: 3872 -location: clients/tests/test-client.py:test_004()/604 +location: clients/tests/test-client.py:test_004()/628 cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -30583,7 +31535,7 @@ proxy.pac-script: -- <<< size: 489 -location: clients/tests/test-client.py:test_004()/605 +location: clients/tests/test-client.py:test_004()/629 cmd: $NMCLI --mode multiline -f VPN con s con-vpn-1 lang: C returncode: 0 @@ -30598,7 +31550,7 @@ vpn.timeout: 0 <<< size: 500 -location: clients/tests/test-client.py:test_004()/606 +location: clients/tests/test-client.py:test_004()/630 cmd: $NMCLI --mode multiline -f VPN con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -30613,7 +31565,7 @@ vpn.timeout: 0 <<< size: 869 -location: clients/tests/test-client.py:test_004()/607 +location: clients/tests/test-client.py:test_004()/631 cmd: $NMCLI --mode multiline -f GENERAL con s con-vpn-1 lang: C returncode: 0 @@ -30635,7 +31587,7 @@ GENERAL.MASTER-PATH: -- <<< size: 882 -location: clients/tests/test-client.py:test_004()/608 +location: clients/tests/test-client.py:test_004()/632 cmd: $NMCLI --mode multiline -f GENERAL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -30657,7 +31609,7 @@ GENERAL.MASTER-PATH: -- <<< size: 1081 -location: clients/tests/test-client.py:test_004()/609 +location: clients/tests/test-client.py:test_004()/633 cmd: $NMCLI --mode multiline dev s lang: C returncode: 0 @@ -30686,7 +31638,7 @@ CONNECTION: -- <<< size: 1096 -location: clients/tests/test-client.py:test_004()/610 +location: clients/tests/test-client.py:test_004()/634 cmd: $NMCLI --mode multiline dev s lang: pl_PL.UTF-8 returncode: 0 @@ -30715,7 +31667,7 @@ CONNECTION: -- <<< size: 2496 -location: clients/tests/test-client.py:test_004()/611 +location: clients/tests/test-client.py:test_004()/635 cmd: $NMCLI --mode multiline -f all dev status lang: C returncode: 0 @@ -30769,7 +31721,7 @@ CON-PATH: -- <<< size: 2521 -location: clients/tests/test-client.py:test_004()/612 +location: clients/tests/test-client.py:test_004()/636 cmd: $NMCLI --mode multiline -f all dev status lang: pl_PL.UTF-8 returncode: 0 @@ -30823,7 +31775,7 @@ CON-PATH: -- <<< size: 8060 -location: clients/tests/test-client.py:test_004()/613 +location: clients/tests/test-client.py:test_004()/637 cmd: $NMCLI --mode multiline dev show lang: C returncode: 0 @@ -30969,7 +31921,7 @@ IP6.DOMAIN[1]: sear6.fo.x.y <<< size: 8091 -location: clients/tests/test-client.py:test_004()/614 +location: clients/tests/test-client.py:test_004()/638 cmd: $NMCLI --mode multiline dev show lang: pl_PL.UTF-8 returncode: 0 @@ -31115,7 +32067,7 @@ IP6.DOMAIN[1]: sear6.fo.x.y <<< size: 22228 -location: clients/tests/test-client.py:test_004()/615 +location: clients/tests/test-client.py:test_004()/639 cmd: $NMCLI --mode multiline -f all dev show lang: C returncode: 0 @@ -31534,7 +32486,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 22389 -location: clients/tests/test-client.py:test_004()/616 +location: clients/tests/test-client.py:test_004()/640 cmd: $NMCLI --mode multiline -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -31953,7 +32905,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 1511 -location: clients/tests/test-client.py:test_004()/617 +location: clients/tests/test-client.py:test_004()/641 cmd: $NMCLI --mode multiline dev show wlan0 lang: C returncode: 0 @@ -31986,7 +32938,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 1522 -location: clients/tests/test-client.py:test_004()/618 +location: clients/tests/test-client.py:test_004()/642 cmd: $NMCLI --mode multiline dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -32019,7 +32971,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 5333 -location: clients/tests/test-client.py:test_004()/619 +location: clients/tests/test-client.py:test_004()/643 cmd: $NMCLI --mode multiline -f all dev show wlan0 lang: C returncode: 0 @@ -32128,7 +33080,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 5391 -location: clients/tests/test-client.py:test_004()/620 +location: clients/tests/test-client.py:test_004()/644 cmd: $NMCLI --mode multiline -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -32237,7 +33189,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 2141 -location: clients/tests/test-client.py:test_004()/621 +location: clients/tests/test-client.py:test_004()/645 cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -32285,7 +33237,7 @@ WIFI-PROPERTIES.IBSS-RSN: no <<< size: 2167 -location: clients/tests/test-client.py:test_004()/622 +location: clients/tests/test-client.py:test_004()/646 cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -32333,7 +33285,7 @@ WIFI-PROPERTIES.IBSS-RSN: nie <<< size: 2141 -location: clients/tests/test-client.py:test_004()/623 +location: clients/tests/test-client.py:test_004()/647 cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -32381,7 +33333,7 @@ WIFI-PROPERTIES.IBSS-RSN: no <<< size: 2167 -location: clients/tests/test-client.py:test_004()/624 +location: clients/tests/test-client.py:test_004()/648 cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -32429,7 +33381,7 @@ WIFI-PROPERTIES.IBSS-RSN: nie <<< size: 1032 -location: clients/tests/test-client.py:test_004()/625 +location: clients/tests/test-client.py:test_004()/649 cmd: $NMCLI --mode multiline -f DEVICE,TYPE,DBUS-PATH dev lang: C returncode: 0 @@ -32453,7 +33405,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Devices/ <<< size: 1042 -location: clients/tests/test-client.py:test_004()/626 +location: clients/tests/test-client.py:test_004()/650 cmd: $NMCLI --mode multiline -f DEVICE,TYPE,DBUS-PATH dev lang: pl_PL.UTF-8 returncode: 0 @@ -32477,7 +33429,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Devices/ <<< size: 3791 -location: clients/tests/test-client.py:test_004()/627 +location: clients/tests/test-client.py:test_004()/651 cmd: $NMCLI --mode multiline -f ALL device wifi list lang: C returncode: 0 @@ -32556,7 +33508,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/AccessPo <<< size: 3849 -location: clients/tests/test-client.py:test_004()/628 +location: clients/tests/test-client.py:test_004()/652 cmd: $NMCLI --mode multiline -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -32635,7 +33587,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/AccessPo <<< size: 1860 -location: clients/tests/test-client.py:test_004()/629 +location: clients/tests/test-client.py:test_004()/653 cmd: $NMCLI --mode multiline -f COMMON device wifi list lang: C returncode: 0 @@ -32682,7 +33634,7 @@ SECURITY: WPA1 WPA2 <<< size: 1906 -location: clients/tests/test-client.py:test_004()/630 +location: clients/tests/test-client.py:test_004()/654 cmd: $NMCLI --mode multiline -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -32729,7 +33681,7 @@ SECURITY: WPA1 WPA2 <<< size: 3904 -location: clients/tests/test-client.py:test_004()/631 +location: clients/tests/test-client.py:test_004()/655 cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: C returncode: 0 @@ -32808,7 +33760,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/AccessPo <<< size: 3962 -location: clients/tests/test-client.py:test_004()/632 +location: clients/tests/test-client.py:test_004()/656 cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -32887,7 +33839,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/AccessPo <<< size: 1112 -location: clients/tests/test-client.py:test_004()/633 +location: clients/tests/test-client.py:test_004()/657 cmd: $NMCLI --mode multiline -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -32915,7 +33867,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/AccessPo <<< size: 1134 -location: clients/tests/test-client.py:test_004()/634 +location: clients/tests/test-client.py:test_004()/658 cmd: $NMCLI --mode multiline -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -32943,7 +33895,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/AccessPo <<< size: 612 -location: clients/tests/test-client.py:test_004()/635 +location: clients/tests/test-client.py:test_004()/659 cmd: $NMCLI --mode multiline -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -32963,7 +33915,7 @@ SECURITY: WPA1 WPA2 <<< size: 631 -location: clients/tests/test-client.py:test_004()/636 +location: clients/tests/test-client.py:test_004()/660 cmd: $NMCLI --mode multiline -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -32983,7 +33935,7 @@ SECURITY: WPA1 WPA2 <<< size: 1225 -location: clients/tests/test-client.py:test_004()/637 +location: clients/tests/test-client.py:test_004()/661 cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -33011,7 +33963,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/AccessPo <<< size: 1247 -location: clients/tests/test-client.py:test_004()/638 +location: clients/tests/test-client.py:test_004()/662 cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -33039,7 +33991,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/AccessPo <<< size: 5336 -location: clients/tests/test-client.py:test_004()/639 +location: clients/tests/test-client.py:test_004()/663 cmd: $NMCLI --mode multiline -f ALL device show wlan0 lang: C returncode: 0 @@ -33148,7 +34100,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 5394 -location: clients/tests/test-client.py:test_004()/640 +location: clients/tests/test-client.py:test_004()/664 cmd: $NMCLI --mode multiline -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -33257,7 +34209,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 1524 -location: clients/tests/test-client.py:test_004()/641 +location: clients/tests/test-client.py:test_004()/665 cmd: $NMCLI --mode multiline -f COMMON device show wlan0 lang: C returncode: 0 @@ -33290,7 +34242,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 1535 -location: clients/tests/test-client.py:test_004()/642 +location: clients/tests/test-client.py:test_004()/666 cmd: $NMCLI --mode multiline -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -33323,7 +34275,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 5343 -location: clients/tests/test-client.py:test_004()/643 +location: clients/tests/test-client.py:test_004()/667 cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 @@ -33429,7 +34381,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 5400 -location: clients/tests/test-client.py:test_004()/644 +location: clients/tests/test-client.py:test_004()/668 cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -33535,7 +34487,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 1447 -location: clients/tests/test-client.py:test_004()/645 +location: clients/tests/test-client.py:test_004()/669 cmd: $NMCLI --mode multiline dev lldp list ifname eth0 lang: C returncode: 0 @@ -33565,7 +34517,7 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES: 40 (wlan-access-point,telephone) <<< size: 1457 -location: clients/tests/test-client.py:test_004()/646 +location: clients/tests/test-client.py:test_004()/670 cmd: $NMCLI --mode multiline dev lldp list ifname eth0 lang: pl_PL.UTF-8 returncode: 0 @@ -33593,9 +34545,57 @@ NEIGHBOR[2].SYSTEM-NAME: test3.example.com NEIGHBOR[2].SYSTEM-DESCRIPTION: Test system #3 NEIGHBOR[2].SYSTEM-CAPABILITIES: 40 (wlan-access-point,telephone) +<<< +size: 1079 +location: clients/tests/test-client.py:test_004()/671 +cmd: $NMCLI --mode multiline -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: C +returncode: 0 +stdout: 704 bytes +>>> +connection.id: con-1 +connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d +connection.type: 802-3-ethernet +connection.interface-name: -- + +connection.id: con-vpn-1 +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.type: vpn +connection.interface-name: -- +vpn.user-name: -- + +connection.id: con-xx1 +connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA +connection.type: 802-11-wireless +connection.interface-name: -- + +<<< +size: 1089 +location: clients/tests/test-client.py:test_004()/672 +cmd: $NMCLI --mode multiline -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 704 bytes +>>> +connection.id: con-1 +connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d +connection.type: 802-3-ethernet +connection.interface-name: -- + +connection.id: con-vpn-1 +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.type: vpn +connection.interface-name: -- +vpn.user-name: -- + +connection.id: con-xx1 +connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA +connection.type: 802-11-wireless +connection.interface-name: -- + <<< size: 4988 -location: clients/tests/test-client.py:test_004()/647 +location: clients/tests/test-client.py:test_004()/673 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1 lang: C returncode: 0 @@ -33705,7 +34705,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 5018 -location: clients/tests/test-client.py:test_004()/648 +location: clients/tests/test-client.py:test_004()/674 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -33815,7 +34815,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 4988 -location: clients/tests/test-client.py:test_004()/649 +location: clients/tests/test-client.py:test_004()/675 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1 lang: C returncode: 0 @@ -33925,7 +34925,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 5018 -location: clients/tests/test-client.py:test_004()/650 +location: clients/tests/test-client.py:test_004()/676 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -34035,7 +35035,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 3864 -location: clients/tests/test-client.py:test_004()/651 +location: clients/tests/test-client.py:test_004()/677 cmd: $NMCLI --mode multiline --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 @@ -34124,7 +35124,7 @@ proxy.pac-script: -- <<< size: 3884 -location: clients/tests/test-client.py:test_004()/652 +location: clients/tests/test-client.py:test_004()/678 cmd: $NMCLI --mode multiline --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -34213,7 +35213,7 @@ proxy.pac-script: -- <<< size: 501 -location: clients/tests/test-client.py:test_004()/653 +location: clients/tests/test-client.py:test_004()/679 cmd: $NMCLI --mode multiline --color yes -f VPN con s con-vpn-1 lang: C returncode: 0 @@ -34228,7 +35228,7 @@ vpn.timeout: 0 <<< size: 512 -location: clients/tests/test-client.py:test_004()/654 +location: clients/tests/test-client.py:test_004()/680 cmd: $NMCLI --mode multiline --color yes -f VPN con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -34243,7 +35243,7 @@ vpn.timeout: 0 <<< size: 881 -location: clients/tests/test-client.py:test_004()/655 +location: clients/tests/test-client.py:test_004()/681 cmd: $NMCLI --mode multiline --color yes -f GENERAL con s con-vpn-1 lang: C returncode: 0 @@ -34265,7 +35265,7 @@ GENERAL.MASTER-PATH: -- <<< size: 894 -location: clients/tests/test-client.py:test_004()/656 +location: clients/tests/test-client.py:test_004()/682 cmd: $NMCLI --mode multiline --color yes -f GENERAL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -34287,7 +35287,7 @@ GENERAL.MASTER-PATH: -- <<< size: 1254 -location: clients/tests/test-client.py:test_004()/657 +location: clients/tests/test-client.py:test_004()/683 cmd: $NMCLI --mode multiline --color yes dev s lang: C returncode: 0 @@ -34316,7 +35316,7 @@ CONNECTION: -- <<< size: 1269 -location: clients/tests/test-client.py:test_004()/658 +location: clients/tests/test-client.py:test_004()/684 cmd: $NMCLI --mode multiline --color yes dev s lang: pl_PL.UTF-8 returncode: 0 @@ -34345,7 +35345,7 @@ CONNECTION: -- <<< size: 2868 -location: clients/tests/test-client.py:test_004()/659 +location: clients/tests/test-client.py:test_004()/685 cmd: $NMCLI --mode multiline --color yes -f all dev status lang: C returncode: 0 @@ -34399,7 +35399,7 @@ CON-PATH: -- <<< size: 2893 -location: clients/tests/test-client.py:test_004()/660 +location: clients/tests/test-client.py:test_004()/686 cmd: $NMCLI --mode multiline --color yes -f all dev status lang: pl_PL.UTF-8 returncode: 0 @@ -34453,7 +35453,7 @@ CON-PATH: -- <<< size: 8072 -location: clients/tests/test-client.py:test_004()/661 +location: clients/tests/test-client.py:test_004()/687 cmd: $NMCLI --mode multiline --color yes dev show lang: C returncode: 0 @@ -34599,7 +35599,7 @@ IP6.DOMAIN[1]: sear6.fo.x.y <<< size: 8103 -location: clients/tests/test-client.py:test_004()/662 +location: clients/tests/test-client.py:test_004()/688 cmd: $NMCLI --mode multiline --color yes dev show lang: pl_PL.UTF-8 returncode: 0 @@ -34745,7 +35745,7 @@ IP6.DOMAIN[1]: sear6.fo.x.y <<< size: 22564 -location: clients/tests/test-client.py:test_004()/663 +location: clients/tests/test-client.py:test_004()/689 cmd: $NMCLI --mode multiline --color yes -f all dev show lang: C returncode: 0 @@ -35164,7 +36164,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 22725 -location: clients/tests/test-client.py:test_004()/664 +location: clients/tests/test-client.py:test_004()/690 cmd: $NMCLI --mode multiline --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -35583,7 +36583,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 1523 -location: clients/tests/test-client.py:test_004()/665 +location: clients/tests/test-client.py:test_004()/691 cmd: $NMCLI --mode multiline --color yes dev show wlan0 lang: C returncode: 0 @@ -35616,7 +36616,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 1534 -location: clients/tests/test-client.py:test_004()/666 +location: clients/tests/test-client.py:test_004()/692 cmd: $NMCLI --mode multiline --color yes dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -35649,7 +36649,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 5588 -location: clients/tests/test-client.py:test_004()/667 +location: clients/tests/test-client.py:test_004()/693 cmd: $NMCLI --mode multiline --color yes -f all dev show wlan0 lang: C returncode: 0 @@ -35758,7 +36758,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 5646 -location: clients/tests/test-client.py:test_004()/668 +location: clients/tests/test-client.py:test_004()/694 cmd: $NMCLI --mode multiline --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -35867,7 +36867,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 2153 -location: clients/tests/test-client.py:test_004()/669 +location: clients/tests/test-client.py:test_004()/695 cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -35915,7 +36915,7 @@ WIFI-PROPERTIES.IBSS-RSN: no <<< size: 2179 -location: clients/tests/test-client.py:test_004()/670 +location: clients/tests/test-client.py:test_004()/696 cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -35963,7 +36963,7 @@ WIFI-PROPERTIES.IBSS-RSN: nie <<< size: 2153 -location: clients/tests/test-client.py:test_004()/671 +location: clients/tests/test-client.py:test_004()/697 cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -36011,7 +37011,7 @@ WIFI-PROPERTIES.IBSS-RSN: no <<< size: 2179 -location: clients/tests/test-client.py:test_004()/672 +location: clients/tests/test-client.py:test_004()/698 cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -36059,7 +37059,7 @@ WIFI-PROPERTIES.IBSS-RSN: nie <<< size: 1164 -location: clients/tests/test-client.py:test_004()/673 +location: clients/tests/test-client.py:test_004()/699 cmd: $NMCLI --mode multiline --color yes -f DEVICE,TYPE,DBUS-PATH dev lang: C returncode: 0 @@ -36083,7 +37083,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Devi <<< size: 1174 -location: clients/tests/test-client.py:test_004()/674 +location: clients/tests/test-client.py:test_004()/700 cmd: $NMCLI --mode multiline --color yes -f DEVICE,TYPE,DBUS-PATH dev lang: pl_PL.UTF-8 returncode: 0 @@ -36107,7 +37107,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Devi <<< size: 4415 -location: clients/tests/test-client.py:test_004()/675 +location: clients/tests/test-client.py:test_004()/701 cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list lang: C returncode: 0 @@ -36186,7 +37186,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Acc <<< size: 4473 -location: clients/tests/test-client.py:test_004()/676 +location: clients/tests/test-client.py:test_004()/702 cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -36265,7 +37265,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Acc <<< size: 2196 -location: clients/tests/test-client.py:test_004()/677 +location: clients/tests/test-client.py:test_004()/703 cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list lang: C returncode: 0 @@ -36312,7 +37312,7 @@ SECURITY: WPA1 WPA2 <<< size: 2242 -location: clients/tests/test-client.py:test_004()/678 +location: clients/tests/test-client.py:test_004()/704 cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -36359,7 +37359,7 @@ SECURITY: WPA1 WPA2 <<< size: 4528 -location: clients/tests/test-client.py:test_004()/679 +location: clients/tests/test-client.py:test_004()/705 cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: C returncode: 0 @@ -36438,7 +37438,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Acc <<< size: 4586 -location: clients/tests/test-client.py:test_004()/680 +location: clients/tests/test-client.py:test_004()/706 cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -36517,7 +37517,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Acc <<< size: 1278 -location: clients/tests/test-client.py:test_004()/681 +location: clients/tests/test-client.py:test_004()/707 cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -36545,7 +37545,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Acc <<< size: 1300 -location: clients/tests/test-client.py:test_004()/682 +location: clients/tests/test-client.py:test_004()/708 cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -36573,7 +37573,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Acc <<< size: 705 -location: clients/tests/test-client.py:test_004()/683 +location: clients/tests/test-client.py:test_004()/709 cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -36593,7 +37593,7 @@ SECURITY: WPA1 WPA2 <<< size: 724 -location: clients/tests/test-client.py:test_004()/684 +location: clients/tests/test-client.py:test_004()/710 cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -36613,7 +37613,7 @@ SECURITY: WPA1 WPA2 <<< size: 1391 -location: clients/tests/test-client.py:test_004()/685 +location: clients/tests/test-client.py:test_004()/711 cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -36641,7 +37641,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Acc <<< size: 1413 -location: clients/tests/test-client.py:test_004()/686 +location: clients/tests/test-client.py:test_004()/712 cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -36669,7 +37669,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Acc <<< size: 5591 -location: clients/tests/test-client.py:test_004()/687 +location: clients/tests/test-client.py:test_004()/713 cmd: $NMCLI --mode multiline --color yes -f ALL device show wlan0 lang: C returncode: 0 @@ -36778,7 +37778,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 5649 -location: clients/tests/test-client.py:test_004()/688 +location: clients/tests/test-client.py:test_004()/714 cmd: $NMCLI --mode multiline --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -36887,7 +37887,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 1536 -location: clients/tests/test-client.py:test_004()/689 +location: clients/tests/test-client.py:test_004()/715 cmd: $NMCLI --mode multiline --color yes -f COMMON device show wlan0 lang: C returncode: 0 @@ -36920,7 +37920,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 1547 -location: clients/tests/test-client.py:test_004()/690 +location: clients/tests/test-client.py:test_004()/716 cmd: $NMCLI --mode multiline --color yes -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -36953,7 +37953,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 5598 -location: clients/tests/test-client.py:test_004()/691 +location: clients/tests/test-client.py:test_004()/717 cmd: $NMCLI --mode multiline --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 @@ -37059,7 +38059,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 5655 -location: clients/tests/test-client.py:test_004()/692 +location: clients/tests/test-client.py:test_004()/718 cmd: $NMCLI --mode multiline --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -37165,7 +38165,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 1459 -location: clients/tests/test-client.py:test_004()/693 +location: clients/tests/test-client.py:test_004()/719 cmd: $NMCLI --mode multiline --color yes dev lldp list ifname eth0 lang: C returncode: 0 @@ -37195,7 +38195,7 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES: 40 (wlan-access-point,telephone) <<< size: 1469 -location: clients/tests/test-client.py:test_004()/694 +location: clients/tests/test-client.py:test_004()/720 cmd: $NMCLI --mode multiline --color yes dev lldp list ifname eth0 lang: pl_PL.UTF-8 returncode: 0 @@ -37223,9 +38223,57 @@ NEIGHBOR[2].SYSTEM-NAME: test3.example.com NEIGHBOR[2].SYSTEM-DESCRIPTION: Test system #3 NEIGHBOR[2].SYSTEM-CAPABILITIES: 40 (wlan-access-point,telephone) +<<< +size: 1091 +location: clients/tests/test-client.py:test_004()/721 +cmd: $NMCLI --mode multiline --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: C +returncode: 0 +stdout: 704 bytes +>>> +connection.id: con-1 +connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d +connection.type: 802-3-ethernet +connection.interface-name: -- + +connection.id: con-vpn-1 +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.type: vpn +connection.interface-name: -- +vpn.user-name: -- + +connection.id: con-xx1 +connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA +connection.type: 802-11-wireless +connection.interface-name: -- + +<<< +size: 1101 +location: clients/tests/test-client.py:test_004()/722 +cmd: $NMCLI --mode multiline --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 704 bytes +>>> +connection.id: con-1 +connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d +connection.type: 802-3-ethernet +connection.interface-name: -- + +connection.id: con-vpn-1 +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.type: vpn +connection.interface-name: -- +vpn.user-name: -- + +connection.id: con-xx1 +connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA +connection.type: 802-11-wireless +connection.interface-name: -- + <<< size: 5997 -location: clients/tests/test-client.py:test_004()/695 +location: clients/tests/test-client.py:test_004()/723 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1 lang: C returncode: 0 @@ -37348,7 +38396,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 6039 -location: clients/tests/test-client.py:test_004()/696 +location: clients/tests/test-client.py:test_004()/724 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -37471,7 +38519,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 5997 -location: clients/tests/test-client.py:test_004()/697 +location: clients/tests/test-client.py:test_004()/725 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1 lang: C returncode: 0 @@ -37594,7 +38642,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 6039 -location: clients/tests/test-client.py:test_004()/698 +location: clients/tests/test-client.py:test_004()/726 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -37717,7 +38765,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 4480 -location: clients/tests/test-client.py:test_004()/699 +location: clients/tests/test-client.py:test_004()/727 cmd: $NMCLI --mode multiline --pretty -f ALL con s con-vpn-1 lang: C returncode: 0 @@ -37814,7 +38862,7 @@ proxy.pac-script: -- <<< size: 4505 -location: clients/tests/test-client.py:test_004()/700 +location: clients/tests/test-client.py:test_004()/728 cmd: $NMCLI --mode multiline --pretty -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -37911,7 +38959,7 @@ proxy.pac-script: -- <<< size: 797 -location: clients/tests/test-client.py:test_004()/701 +location: clients/tests/test-client.py:test_004()/729 cmd: $NMCLI --mode multiline --pretty -f VPN con s con-vpn-1 lang: C returncode: 0 @@ -37930,7 +38978,7 @@ vpn.timeout: 0 <<< size: 813 -location: clients/tests/test-client.py:test_004()/702 +location: clients/tests/test-client.py:test_004()/730 cmd: $NMCLI --mode multiline --pretty -f VPN con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -37949,7 +38997,7 @@ vpn.timeout: 0 <<< size: 1192 -location: clients/tests/test-client.py:test_004()/703 +location: clients/tests/test-client.py:test_004()/731 cmd: $NMCLI --mode multiline --pretty -f GENERAL con s con-vpn-1 lang: C returncode: 0 @@ -37975,7 +39023,7 @@ GENERAL.MASTER-PATH: -- <<< size: 1212 -location: clients/tests/test-client.py:test_004()/704 +location: clients/tests/test-client.py:test_004()/732 cmd: $NMCLI --mode multiline --pretty -f GENERAL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -38001,7 +39049,7 @@ GENERAL.MASTER-PATH: -- <<< size: 1700 -location: clients/tests/test-client.py:test_004()/705 +location: clients/tests/test-client.py:test_004()/733 cmd: $NMCLI --mode multiline --pretty dev s lang: C returncode: 0 @@ -38038,7 +39086,7 @@ CONNECTION: -- <<< size: 1715 -location: clients/tests/test-client.py:test_004()/706 +location: clients/tests/test-client.py:test_004()/734 cmd: $NMCLI --mode multiline --pretty dev s lang: pl_PL.UTF-8 returncode: 0 @@ -38075,7 +39123,7 @@ CONNECTION: -- <<< size: 3114 -location: clients/tests/test-client.py:test_004()/707 +location: clients/tests/test-client.py:test_004()/735 cmd: $NMCLI --mode multiline --pretty -f all dev status lang: C returncode: 0 @@ -38137,7 +39185,7 @@ CON-PATH: -- <<< size: 3139 -location: clients/tests/test-client.py:test_004()/708 +location: clients/tests/test-client.py:test_004()/736 cmd: $NMCLI --mode multiline --pretty -f all dev status lang: pl_PL.UTF-8 returncode: 0 @@ -38199,7 +39247,7 @@ CON-PATH: -- <<< size: 12885 -location: clients/tests/test-client.py:test_004()/709 +location: clients/tests/test-client.py:test_004()/737 cmd: $NMCLI --mode multiline --pretty dev show lang: C returncode: 0 @@ -38407,7 +39455,7 @@ IP6.DOMAIN[1]: sear6.fo.x.y <<< size: 12949 -location: clients/tests/test-client.py:test_004()/710 +location: clients/tests/test-client.py:test_004()/738 cmd: $NMCLI --mode multiline --pretty dev show lang: pl_PL.UTF-8 returncode: 0 @@ -38615,7 +39663,7 @@ IP6.DOMAIN[1]: sear6.fo.x.y <<< size: 27212 -location: clients/tests/test-client.py:test_004()/711 +location: clients/tests/test-client.py:test_004()/739 cmd: $NMCLI --mode multiline --pretty -f all dev show lang: C returncode: 0 @@ -39098,7 +40146,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 27406 -location: clients/tests/test-client.py:test_004()/712 +location: clients/tests/test-client.py:test_004()/740 cmd: $NMCLI --mode multiline --pretty -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -39581,7 +40629,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 2451 -location: clients/tests/test-client.py:test_004()/713 +location: clients/tests/test-client.py:test_004()/741 cmd: $NMCLI --mode multiline --pretty dev show wlan0 lang: C returncode: 0 @@ -39626,7 +40674,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 2469 -location: clients/tests/test-client.py:test_004()/714 +location: clients/tests/test-client.py:test_004()/742 cmd: $NMCLI --mode multiline --pretty dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -39671,7 +40719,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 6513 -location: clients/tests/test-client.py:test_004()/715 +location: clients/tests/test-client.py:test_004()/743 cmd: $NMCLI --mode multiline --pretty -f all dev show wlan0 lang: C returncode: 0 @@ -39795,7 +40843,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 6578 -location: clients/tests/test-client.py:test_004()/716 +location: clients/tests/test-client.py:test_004()/744 cmd: $NMCLI --mode multiline --pretty -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -39919,7 +40967,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 2601 -location: clients/tests/test-client.py:test_004()/717 +location: clients/tests/test-client.py:test_004()/745 cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -39973,7 +41021,7 @@ WIFI-PROPERTIES.IBSS-RSN: no <<< size: 2634 -location: clients/tests/test-client.py:test_004()/718 +location: clients/tests/test-client.py:test_004()/746 cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -40027,7 +41075,7 @@ WIFI-PROPERTIES.IBSS-RSN: nie <<< size: 2601 -location: clients/tests/test-client.py:test_004()/719 +location: clients/tests/test-client.py:test_004()/747 cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -40081,7 +41129,7 @@ WIFI-PROPERTIES.IBSS-RSN: no <<< size: 2634 -location: clients/tests/test-client.py:test_004()/720 +location: clients/tests/test-client.py:test_004()/748 cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -40135,7 +41183,7 @@ WIFI-PROPERTIES.IBSS-RSN: nie <<< size: 1651 -location: clients/tests/test-client.py:test_004()/721 +location: clients/tests/test-client.py:test_004()/749 cmd: $NMCLI --mode multiline --pretty -f DEVICE,TYPE,DBUS-PATH dev lang: C returncode: 0 @@ -40167,7 +41215,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Devices/ <<< size: 1661 -location: clients/tests/test-client.py:test_004()/722 +location: clients/tests/test-client.py:test_004()/750 cmd: $NMCLI --mode multiline --pretty -f DEVICE,TYPE,DBUS-PATH dev lang: pl_PL.UTF-8 returncode: 0 @@ -40199,7 +41247,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Devices/ <<< size: 4756 -location: clients/tests/test-client.py:test_004()/723 +location: clients/tests/test-client.py:test_004()/751 cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list lang: C returncode: 0 @@ -40291,7 +41339,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/AccessPo <<< size: 4832 -location: clients/tests/test-client.py:test_004()/724 +location: clients/tests/test-client.py:test_004()/752 cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -40383,7 +41431,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/AccessPo <<< size: 2825 -location: clients/tests/test-client.py:test_004()/725 +location: clients/tests/test-client.py:test_004()/753 cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list lang: C returncode: 0 @@ -40443,7 +41491,7 @@ SECURITY: WPA1 WPA2 <<< size: 2889 -location: clients/tests/test-client.py:test_004()/726 +location: clients/tests/test-client.py:test_004()/754 cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -40503,7 +41551,7 @@ SECURITY: WPA1 WPA2 <<< size: 4869 -location: clients/tests/test-client.py:test_004()/727 +location: clients/tests/test-client.py:test_004()/755 cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: C returncode: 0 @@ -40595,7 +41643,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/AccessPo <<< size: 4945 -location: clients/tests/test-client.py:test_004()/728 +location: clients/tests/test-client.py:test_004()/756 cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -40687,7 +41735,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/AccessPo <<< size: 1414 -location: clients/tests/test-client.py:test_004()/729 +location: clients/tests/test-client.py:test_004()/757 cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -40719,7 +41767,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/AccessPo <<< size: 1442 -location: clients/tests/test-client.py:test_004()/730 +location: clients/tests/test-client.py:test_004()/758 cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -40751,7 +41799,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/AccessPo <<< size: 913 -location: clients/tests/test-client.py:test_004()/731 +location: clients/tests/test-client.py:test_004()/759 cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -40775,7 +41823,7 @@ SECURITY: WPA1 WPA2 <<< size: 938 -location: clients/tests/test-client.py:test_004()/732 +location: clients/tests/test-client.py:test_004()/760 cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -40799,7 +41847,7 @@ SECURITY: WPA1 WPA2 <<< size: 1527 -location: clients/tests/test-client.py:test_004()/733 +location: clients/tests/test-client.py:test_004()/761 cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -40831,7 +41879,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/AccessPo <<< size: 1555 -location: clients/tests/test-client.py:test_004()/734 +location: clients/tests/test-client.py:test_004()/762 cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -40863,7 +41911,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/AccessPo <<< size: 6516 -location: clients/tests/test-client.py:test_004()/735 +location: clients/tests/test-client.py:test_004()/763 cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0 lang: C returncode: 0 @@ -40987,7 +42035,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 6581 -location: clients/tests/test-client.py:test_004()/736 +location: clients/tests/test-client.py:test_004()/764 cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -41111,7 +42159,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 2464 -location: clients/tests/test-client.py:test_004()/737 +location: clients/tests/test-client.py:test_004()/765 cmd: $NMCLI --mode multiline --pretty -f COMMON device show wlan0 lang: C returncode: 0 @@ -41156,7 +42204,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 2482 -location: clients/tests/test-client.py:test_004()/738 +location: clients/tests/test-client.py:test_004()/766 cmd: $NMCLI --mode multiline --pretty -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -41201,7 +42249,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 6443 -location: clients/tests/test-client.py:test_004()/739 +location: clients/tests/test-client.py:test_004()/767 cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 @@ -41321,7 +42369,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 6507 -location: clients/tests/test-client.py:test_004()/740 +location: clients/tests/test-client.py:test_004()/768 cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -41441,7 +42489,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 1910 -location: clients/tests/test-client.py:test_004()/741 +location: clients/tests/test-client.py:test_004()/769 cmd: $NMCLI --mode multiline --pretty dev lldp list ifname eth0 lang: C returncode: 0 @@ -41477,7 +42525,7 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES: 40 (wlan-access-point,telephone) <<< size: 1924 -location: clients/tests/test-client.py:test_004()/742 +location: clients/tests/test-client.py:test_004()/770 cmd: $NMCLI --mode multiline --pretty dev lldp list ifname eth0 lang: pl_PL.UTF-8 returncode: 0 @@ -41511,9 +42559,101 @@ NEIGHBOR[2].SYSTEM-DESCRIPTION: Test system #3 NEIGHBOR[2].SYSTEM-CAPABILITIES: 40 (wlan-access-point,telephone) ------------------------------------------------------------------------------- +<<< +size: 2783 +location: clients/tests/test-client.py:test_004()/771 +cmd: $NMCLI --mode multiline --pretty -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: C +returncode: 0 +stdout: 2398 bytes +>>> +=============================================================================== + Connection profile details (con-1) +=============================================================================== +connection.id: con-1 +------------------------------------------------------------------------------- +connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d +------------------------------------------------------------------------------- +connection.type: 802-3-ethernet +------------------------------------------------------------------------------- +connection.interface-name: -- +------------------------------------------------------------------------------- + +=============================================================================== + Connection profile details (con-vpn-1) +=============================================================================== +connection.id: con-vpn-1 +------------------------------------------------------------------------------- +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +------------------------------------------------------------------------------- +connection.type: vpn +------------------------------------------------------------------------------- +connection.interface-name: -- +------------------------------------------------------------------------------- +vpn.user-name: -- +------------------------------------------------------------------------------- + +=============================================================================== + Connection profile details (con-xx1) +=============================================================================== +connection.id: con-xx1 +------------------------------------------------------------------------------- +connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA +------------------------------------------------------------------------------- +connection.type: 802-11-wireless +------------------------------------------------------------------------------- +connection.interface-name: -- +------------------------------------------------------------------------------- + +<<< +size: 2808 +location: clients/tests/test-client.py:test_004()/772 +cmd: $NMCLI --mode multiline --pretty -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2413 bytes +>>> +=============================================================================== + Szczegóły profilu połączenia (con-1) +=============================================================================== +connection.id: con-1 +------------------------------------------------------------------------------- +connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d +------------------------------------------------------------------------------- +connection.type: 802-3-ethernet +------------------------------------------------------------------------------- +connection.interface-name: -- +------------------------------------------------------------------------------- + +=============================================================================== + Szczegóły profilu połączenia (con-vpn-1) +=============================================================================== +connection.id: con-vpn-1 +------------------------------------------------------------------------------- +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +------------------------------------------------------------------------------- +connection.type: vpn +------------------------------------------------------------------------------- +connection.interface-name: -- +------------------------------------------------------------------------------- +vpn.user-name: -- +------------------------------------------------------------------------------- + +=============================================================================== + Szczegóły profilu połączenia (con-xx1) +=============================================================================== +connection.id: con-xx1 +------------------------------------------------------------------------------- +connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA +------------------------------------------------------------------------------- +connection.type: 802-11-wireless +------------------------------------------------------------------------------- +connection.interface-name: -- +------------------------------------------------------------------------------- + <<< size: 6009 -location: clients/tests/test-client.py:test_004()/743 +location: clients/tests/test-client.py:test_004()/773 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1 lang: C returncode: 0 @@ -41636,7 +42776,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 6051 -location: clients/tests/test-client.py:test_004()/744 +location: clients/tests/test-client.py:test_004()/774 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -41759,7 +42899,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 6009 -location: clients/tests/test-client.py:test_004()/745 +location: clients/tests/test-client.py:test_004()/775 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1 lang: C returncode: 0 @@ -41882,7 +43022,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 6051 -location: clients/tests/test-client.py:test_004()/746 +location: clients/tests/test-client.py:test_004()/776 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -42005,7 +43145,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 4492 -location: clients/tests/test-client.py:test_004()/747 +location: clients/tests/test-client.py:test_004()/777 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 @@ -42102,7 +43242,7 @@ proxy.pac-script: -- <<< size: 4517 -location: clients/tests/test-client.py:test_004()/748 +location: clients/tests/test-client.py:test_004()/778 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -42199,7 +43339,7 @@ proxy.pac-script: -- <<< size: 809 -location: clients/tests/test-client.py:test_004()/749 +location: clients/tests/test-client.py:test_004()/779 cmd: $NMCLI --mode multiline --pretty --color yes -f VPN con s con-vpn-1 lang: C returncode: 0 @@ -42218,7 +43358,7 @@ vpn.timeout: 0 <<< size: 825 -location: clients/tests/test-client.py:test_004()/750 +location: clients/tests/test-client.py:test_004()/780 cmd: $NMCLI --mode multiline --pretty --color yes -f VPN con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -42237,7 +43377,7 @@ vpn.timeout: 0 <<< size: 1204 -location: clients/tests/test-client.py:test_004()/751 +location: clients/tests/test-client.py:test_004()/781 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL con s con-vpn-1 lang: C returncode: 0 @@ -42263,7 +43403,7 @@ GENERAL.MASTER-PATH: -- <<< size: 1224 -location: clients/tests/test-client.py:test_004()/752 +location: clients/tests/test-client.py:test_004()/782 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -42289,7 +43429,7 @@ GENERAL.MASTER-PATH: -- <<< size: 1872 -location: clients/tests/test-client.py:test_004()/753 +location: clients/tests/test-client.py:test_004()/783 cmd: $NMCLI --mode multiline --pretty --color yes dev s lang: C returncode: 0 @@ -42326,7 +43466,7 @@ CONNECTION: -- <<< size: 1887 -location: clients/tests/test-client.py:test_004()/754 +location: clients/tests/test-client.py:test_004()/784 cmd: $NMCLI --mode multiline --pretty --color yes dev s lang: pl_PL.UTF-8 returncode: 0 @@ -42363,7 +43503,7 @@ CONNECTION: -- <<< size: 3486 -location: clients/tests/test-client.py:test_004()/755 +location: clients/tests/test-client.py:test_004()/785 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev status lang: C returncode: 0 @@ -42425,7 +43565,7 @@ CON-PATH: -- <<< size: 3511 -location: clients/tests/test-client.py:test_004()/756 +location: clients/tests/test-client.py:test_004()/786 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev status lang: pl_PL.UTF-8 returncode: 0 @@ -42487,7 +43627,7 @@ CON-PATH: -- <<< size: 12897 -location: clients/tests/test-client.py:test_004()/757 +location: clients/tests/test-client.py:test_004()/787 cmd: $NMCLI --mode multiline --pretty --color yes dev show lang: C returncode: 0 @@ -42695,7 +43835,7 @@ IP6.DOMAIN[1]: sear6.fo.x.y <<< size: 12961 -location: clients/tests/test-client.py:test_004()/758 +location: clients/tests/test-client.py:test_004()/788 cmd: $NMCLI --mode multiline --pretty --color yes dev show lang: pl_PL.UTF-8 returncode: 0 @@ -42903,7 +44043,7 @@ IP6.DOMAIN[1]: sear6.fo.x.y <<< size: 27548 -location: clients/tests/test-client.py:test_004()/759 +location: clients/tests/test-client.py:test_004()/789 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show lang: C returncode: 0 @@ -43386,7 +44526,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 27742 -location: clients/tests/test-client.py:test_004()/760 +location: clients/tests/test-client.py:test_004()/790 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -43869,7 +45009,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 2463 -location: clients/tests/test-client.py:test_004()/761 +location: clients/tests/test-client.py:test_004()/791 cmd: $NMCLI --mode multiline --pretty --color yes dev show wlan0 lang: C returncode: 0 @@ -43914,7 +45054,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 2481 -location: clients/tests/test-client.py:test_004()/762 +location: clients/tests/test-client.py:test_004()/792 cmd: $NMCLI --mode multiline --pretty --color yes dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -43959,7 +45099,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 6768 -location: clients/tests/test-client.py:test_004()/763 +location: clients/tests/test-client.py:test_004()/793 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show wlan0 lang: C returncode: 0 @@ -44083,7 +45223,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 6833 -location: clients/tests/test-client.py:test_004()/764 +location: clients/tests/test-client.py:test_004()/794 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -44207,7 +45347,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 2613 -location: clients/tests/test-client.py:test_004()/765 +location: clients/tests/test-client.py:test_004()/795 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -44261,7 +45401,7 @@ WIFI-PROPERTIES.IBSS-RSN: no <<< size: 2646 -location: clients/tests/test-client.py:test_004()/766 +location: clients/tests/test-client.py:test_004()/796 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -44315,7 +45455,7 @@ WIFI-PROPERTIES.IBSS-RSN: nie <<< size: 2613 -location: clients/tests/test-client.py:test_004()/767 +location: clients/tests/test-client.py:test_004()/797 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -44369,7 +45509,7 @@ WIFI-PROPERTIES.IBSS-RSN: no <<< size: 2646 -location: clients/tests/test-client.py:test_004()/768 +location: clients/tests/test-client.py:test_004()/798 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -44423,7 +45563,7 @@ WIFI-PROPERTIES.IBSS-RSN: nie <<< size: 1783 -location: clients/tests/test-client.py:test_004()/769 +location: clients/tests/test-client.py:test_004()/799 cmd: $NMCLI --mode multiline --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev lang: C returncode: 0 @@ -44455,7 +45595,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Devi <<< size: 1793 -location: clients/tests/test-client.py:test_004()/770 +location: clients/tests/test-client.py:test_004()/800 cmd: $NMCLI --mode multiline --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev lang: pl_PL.UTF-8 returncode: 0 @@ -44487,7 +45627,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Devi <<< size: 5380 -location: clients/tests/test-client.py:test_004()/771 +location: clients/tests/test-client.py:test_004()/801 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list lang: C returncode: 0 @@ -44579,7 +45719,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Acc <<< size: 5456 -location: clients/tests/test-client.py:test_004()/772 +location: clients/tests/test-client.py:test_004()/802 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -44671,7 +45811,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Acc <<< size: 3161 -location: clients/tests/test-client.py:test_004()/773 +location: clients/tests/test-client.py:test_004()/803 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list lang: C returncode: 0 @@ -44731,7 +45871,7 @@ SECURITY: WPA1 WPA2 <<< size: 3225 -location: clients/tests/test-client.py:test_004()/774 +location: clients/tests/test-client.py:test_004()/804 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -44791,7 +45931,7 @@ SECURITY: WPA1 WPA2 <<< size: 5493 -location: clients/tests/test-client.py:test_004()/775 +location: clients/tests/test-client.py:test_004()/805 cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: C returncode: 0 @@ -44883,7 +46023,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Acc <<< size: 5569 -location: clients/tests/test-client.py:test_004()/776 +location: clients/tests/test-client.py:test_004()/806 cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -44975,7 +46115,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Acc <<< size: 1579 -location: clients/tests/test-client.py:test_004()/777 +location: clients/tests/test-client.py:test_004()/807 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -45007,7 +46147,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Acc <<< size: 1607 -location: clients/tests/test-client.py:test_004()/778 +location: clients/tests/test-client.py:test_004()/808 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -45039,7 +46179,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Acc <<< size: 1006 -location: clients/tests/test-client.py:test_004()/779 +location: clients/tests/test-client.py:test_004()/809 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -45063,7 +46203,7 @@ SECURITY: WPA1 WPA2 <<< size: 1031 -location: clients/tests/test-client.py:test_004()/780 +location: clients/tests/test-client.py:test_004()/810 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -45087,7 +46227,7 @@ SECURITY: WPA1 WPA2 <<< size: 1692 -location: clients/tests/test-client.py:test_004()/781 +location: clients/tests/test-client.py:test_004()/811 cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -45119,7 +46259,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Acc <<< size: 1720 -location: clients/tests/test-client.py:test_004()/782 +location: clients/tests/test-client.py:test_004()/812 cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -45151,7 +46291,7 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Acc <<< size: 6771 -location: clients/tests/test-client.py:test_004()/783 +location: clients/tests/test-client.py:test_004()/813 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device show wlan0 lang: C returncode: 0 @@ -45275,7 +46415,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 6836 -location: clients/tests/test-client.py:test_004()/784 +location: clients/tests/test-client.py:test_004()/814 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -45399,7 +46539,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 2476 -location: clients/tests/test-client.py:test_004()/785 +location: clients/tests/test-client.py:test_004()/815 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device show wlan0 lang: C returncode: 0 @@ -45444,7 +46584,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 2494 -location: clients/tests/test-client.py:test_004()/786 +location: clients/tests/test-client.py:test_004()/816 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -45489,7 +46629,7 @@ IP6.DOMAIN[6]: sear6.foo4.bar <<< size: 6698 -location: clients/tests/test-client.py:test_004()/787 +location: clients/tests/test-client.py:test_004()/817 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 @@ -45609,7 +46749,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 6762 -location: clients/tests/test-client.py:test_004()/788 +location: clients/tests/test-client.py:test_004()/818 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -45729,7 +46869,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c <<< size: 1922 -location: clients/tests/test-client.py:test_004()/789 +location: clients/tests/test-client.py:test_004()/819 cmd: $NMCLI --mode multiline --pretty --color yes dev lldp list ifname eth0 lang: C returncode: 0 @@ -45765,7 +46905,7 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES: 40 (wlan-access-point,telephone) <<< size: 1936 -location: clients/tests/test-client.py:test_004()/790 +location: clients/tests/test-client.py:test_004()/820 cmd: $NMCLI --mode multiline --pretty --color yes dev lldp list ifname eth0 lang: pl_PL.UTF-8 returncode: 0 @@ -45799,9 +46939,101 @@ NEIGHBOR[2].SYSTEM-DESCRIPTION: Test system #3 NEIGHBOR[2].SYSTEM-CAPABILITIES: 40 (wlan-access-point,telephone) ------------------------------------------------------------------------------- +<<< +size: 2795 +location: clients/tests/test-client.py:test_004()/821 +cmd: $NMCLI --mode multiline --pretty --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: C +returncode: 0 +stdout: 2398 bytes +>>> +=============================================================================== + Connection profile details (con-1) +=============================================================================== +connection.id: con-1 +------------------------------------------------------------------------------- +connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d +------------------------------------------------------------------------------- +connection.type: 802-3-ethernet +------------------------------------------------------------------------------- +connection.interface-name: -- +------------------------------------------------------------------------------- + +=============================================================================== + Connection profile details (con-vpn-1) +=============================================================================== +connection.id: con-vpn-1 +------------------------------------------------------------------------------- +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +------------------------------------------------------------------------------- +connection.type: vpn +------------------------------------------------------------------------------- +connection.interface-name: -- +------------------------------------------------------------------------------- +vpn.user-name: -- +------------------------------------------------------------------------------- + +=============================================================================== + Connection profile details (con-xx1) +=============================================================================== +connection.id: con-xx1 +------------------------------------------------------------------------------- +connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA +------------------------------------------------------------------------------- +connection.type: 802-11-wireless +------------------------------------------------------------------------------- +connection.interface-name: -- +------------------------------------------------------------------------------- + +<<< +size: 2820 +location: clients/tests/test-client.py:test_004()/822 +cmd: $NMCLI --mode multiline --pretty --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2413 bytes +>>> +=============================================================================== + Szczegóły profilu połączenia (con-1) +=============================================================================== +connection.id: con-1 +------------------------------------------------------------------------------- +connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d +------------------------------------------------------------------------------- +connection.type: 802-3-ethernet +------------------------------------------------------------------------------- +connection.interface-name: -- +------------------------------------------------------------------------------- + +=============================================================================== + Szczegóły profilu połączenia (con-vpn-1) +=============================================================================== +connection.id: con-vpn-1 +------------------------------------------------------------------------------- +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +------------------------------------------------------------------------------- +connection.type: vpn +------------------------------------------------------------------------------- +connection.interface-name: -- +------------------------------------------------------------------------------- +vpn.user-name: -- +------------------------------------------------------------------------------- + +=============================================================================== + Szczegóły profilu połączenia (con-xx1) +=============================================================================== +connection.id: con-xx1 +------------------------------------------------------------------------------- +connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA +------------------------------------------------------------------------------- +connection.type: 802-11-wireless +------------------------------------------------------------------------------- +connection.interface-name: -- +------------------------------------------------------------------------------- + <<< size: 2515 -location: clients/tests/test-client.py:test_004()/791 +location: clients/tests/test-client.py:test_004()/823 cmd: $NMCLI --mode multiline --terse con s con-vpn-1 lang: C returncode: 0 @@ -45911,7 +47143,7 @@ VPN.CFG[3]:key3 = val3 <<< size: 2525 -location: clients/tests/test-client.py:test_004()/792 +location: clients/tests/test-client.py:test_004()/824 cmd: $NMCLI --mode multiline --terse con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -46021,7 +47253,7 @@ VPN.CFG[3]:key3 = val3 <<< size: 2515 -location: clients/tests/test-client.py:test_004()/793 +location: clients/tests/test-client.py:test_004()/825 cmd: $NMCLI --mode multiline --terse con s con-vpn-1 lang: C returncode: 0 @@ -46131,7 +47363,7 @@ VPN.CFG[3]:key3 = val3 <<< size: 2525 -location: clients/tests/test-client.py:test_004()/794 +location: clients/tests/test-client.py:test_004()/826 cmd: $NMCLI --mode multiline --terse con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -46241,7 +47473,7 @@ VPN.CFG[3]:key3 = val3 <<< size: 1945 -location: clients/tests/test-client.py:test_004()/795 +location: clients/tests/test-client.py:test_004()/827 cmd: $NMCLI --mode multiline --terse -f ALL con s con-vpn-1 lang: C returncode: 0 @@ -46330,7 +47562,7 @@ proxy.pac-script: <<< size: 1955 -location: clients/tests/test-client.py:test_004()/796 +location: clients/tests/test-client.py:test_004()/828 cmd: $NMCLI --mode multiline --terse -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -46419,7 +47651,7 @@ proxy.pac-script: <<< size: 334 -location: clients/tests/test-client.py:test_004()/797 +location: clients/tests/test-client.py:test_004()/829 cmd: $NMCLI --mode multiline --terse -f VPN con s con-vpn-1 lang: C returncode: 0 @@ -46434,7 +47666,7 @@ vpn.timeout:0 <<< size: 344 -location: clients/tests/test-client.py:test_004()/798 +location: clients/tests/test-client.py:test_004()/830 cmd: $NMCLI --mode multiline --terse -f VPN con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -46449,7 +47681,7 @@ vpn.timeout:0 <<< size: 555 -location: clients/tests/test-client.py:test_004()/799 +location: clients/tests/test-client.py:test_004()/831 cmd: $NMCLI --mode multiline --terse -f GENERAL con s con-vpn-1 lang: C returncode: 0 @@ -46471,7 +47703,7 @@ GENERAL.MASTER-PATH: <<< size: 565 -location: clients/tests/test-client.py:test_004()/800 +location: clients/tests/test-client.py:test_004()/832 cmd: $NMCLI --mode multiline --terse -f GENERAL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -46493,7 +47725,7 @@ GENERAL.MASTER-PATH: <<< size: 426 -location: clients/tests/test-client.py:test_004()/801 +location: clients/tests/test-client.py:test_004()/833 cmd: $NMCLI --mode multiline --terse dev s lang: C returncode: 0 @@ -46522,7 +47754,7 @@ CONNECTION: <<< size: 436 -location: clients/tests/test-client.py:test_004()/802 +location: clients/tests/test-client.py:test_004()/834 cmd: $NMCLI --mode multiline --terse dev s lang: pl_PL.UTF-8 returncode: 0 @@ -46551,7 +47783,7 @@ CONNECTION: <<< size: 1134 -location: clients/tests/test-client.py:test_004()/803 +location: clients/tests/test-client.py:test_004()/835 cmd: $NMCLI --mode multiline --terse -f all dev status lang: C returncode: 0 @@ -46605,7 +47837,7 @@ CON-PATH: <<< size: 1144 -location: clients/tests/test-client.py:test_004()/804 +location: clients/tests/test-client.py:test_004()/836 cmd: $NMCLI --mode multiline --terse -f all dev status lang: pl_PL.UTF-8 returncode: 0 @@ -46659,7 +47891,7 @@ CON-PATH: <<< size: 4552 -location: clients/tests/test-client.py:test_004()/805 +location: clients/tests/test-client.py:test_004()/837 cmd: $NMCLI --mode multiline --terse dev show lang: C returncode: 0 @@ -46805,7 +48037,7 @@ IP6.DOMAIN[1]:sear6.fo.x.y <<< size: 4562 -location: clients/tests/test-client.py:test_004()/806 +location: clients/tests/test-client.py:test_004()/838 cmd: $NMCLI --mode multiline --terse dev show lang: pl_PL.UTF-8 returncode: 0 @@ -46951,7 +48183,7 @@ IP6.DOMAIN[1]:sear6.fo.x.y <<< size: 12910 -location: clients/tests/test-client.py:test_004()/807 +location: clients/tests/test-client.py:test_004()/839 cmd: $NMCLI --mode multiline --terse -f all dev show lang: C returncode: 0 @@ -47370,7 +48602,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 12956 -location: clients/tests/test-client.py:test_004()/808 +location: clients/tests/test-client.py:test_004()/840 cmd: $NMCLI --mode multiline --terse -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -47789,7 +49021,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 894 -location: clients/tests/test-client.py:test_004()/809 +location: clients/tests/test-client.py:test_004()/841 cmd: $NMCLI --mode multiline --terse dev show wlan0 lang: C returncode: 0 @@ -47822,7 +49054,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar <<< size: 904 -location: clients/tests/test-client.py:test_004()/810 +location: clients/tests/test-client.py:test_004()/842 cmd: $NMCLI --mode multiline --terse dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -47855,7 +49087,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar <<< size: 2986 -location: clients/tests/test-client.py:test_004()/811 +location: clients/tests/test-client.py:test_004()/843 cmd: $NMCLI --mode multiline --terse -f all dev show wlan0 lang: C returncode: 0 @@ -47964,7 +49196,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 3023 -location: clients/tests/test-client.py:test_004()/812 +location: clients/tests/test-client.py:test_004()/844 cmd: $NMCLI --mode multiline --terse -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -48073,7 +49305,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 1315 -location: clients/tests/test-client.py:test_004()/813 +location: clients/tests/test-client.py:test_004()/845 cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -48121,7 +49353,7 @@ WIFI-PROPERTIES.IBSS-RSN:no <<< size: 1325 -location: clients/tests/test-client.py:test_004()/814 +location: clients/tests/test-client.py:test_004()/846 cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -48169,7 +49401,7 @@ WIFI-PROPERTIES.IBSS-RSN:no <<< size: 1315 -location: clients/tests/test-client.py:test_004()/815 +location: clients/tests/test-client.py:test_004()/847 cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -48217,7 +49449,7 @@ WIFI-PROPERTIES.IBSS-RSN:no <<< size: 1325 -location: clients/tests/test-client.py:test_004()/816 +location: clients/tests/test-client.py:test_004()/848 cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -48265,7 +49497,7 @@ WIFI-PROPERTIES.IBSS-RSN:no <<< size: 550 -location: clients/tests/test-client.py:test_004()/817 +location: clients/tests/test-client.py:test_004()/849 cmd: $NMCLI --mode multiline --terse -f DEVICE,TYPE,DBUS-PATH dev lang: C returncode: 0 @@ -48289,7 +49521,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5 <<< size: 560 -location: clients/tests/test-client.py:test_004()/818 +location: clients/tests/test-client.py:test_004()/850 cmd: $NMCLI --mode multiline --terse -f DEVICE,TYPE,DBUS-PATH dev lang: pl_PL.UTF-8 returncode: 0 @@ -48313,7 +49545,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5 <<< size: 1547 -location: clients/tests/test-client.py:test_004()/819 +location: clients/tests/test-client.py:test_004()/851 cmd: $NMCLI --mode multiline --terse -f ALL device wifi list lang: C returncode: 0 @@ -48392,7 +49624,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4 <<< size: 1605 -location: clients/tests/test-client.py:test_004()/820 +location: clients/tests/test-client.py:test_004()/852 cmd: $NMCLI --mode multiline --terse -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -48471,7 +49703,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4 <<< size: 643 -location: clients/tests/test-client.py:test_004()/821 +location: clients/tests/test-client.py:test_004()/853 cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list lang: C returncode: 0 @@ -48518,7 +49750,7 @@ SECURITY:WPA1 WPA2 <<< size: 689 -location: clients/tests/test-client.py:test_004()/822 +location: clients/tests/test-client.py:test_004()/854 cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -48565,7 +49797,7 @@ SECURITY:WPA1 WPA2 <<< size: 1660 -location: clients/tests/test-client.py:test_004()/823 +location: clients/tests/test-client.py:test_004()/855 cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: C returncode: 0 @@ -48644,7 +49876,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4 <<< size: 1718 -location: clients/tests/test-client.py:test_004()/824 +location: clients/tests/test-client.py:test_004()/856 cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -48723,7 +49955,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4 <<< size: 557 -location: clients/tests/test-client.py:test_004()/825 +location: clients/tests/test-client.py:test_004()/857 cmd: $NMCLI --mode multiline --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -48751,7 +49983,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2 <<< size: 579 -location: clients/tests/test-client.py:test_004()/826 +location: clients/tests/test-client.py:test_004()/858 cmd: $NMCLI --mode multiline --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -48779,7 +50011,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2 <<< size: 314 -location: clients/tests/test-client.py:test_004()/827 +location: clients/tests/test-client.py:test_004()/859 cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -48799,7 +50031,7 @@ SECURITY:WPA1 WPA2 <<< size: 333 -location: clients/tests/test-client.py:test_004()/828 +location: clients/tests/test-client.py:test_004()/860 cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -48819,7 +50051,7 @@ SECURITY:WPA1 WPA2 <<< size: 670 -location: clients/tests/test-client.py:test_004()/829 +location: clients/tests/test-client.py:test_004()/861 cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -48847,7 +50079,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2 <<< size: 692 -location: clients/tests/test-client.py:test_004()/830 +location: clients/tests/test-client.py:test_004()/862 cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -48875,7 +50107,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2 <<< size: 2989 -location: clients/tests/test-client.py:test_004()/831 +location: clients/tests/test-client.py:test_004()/863 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0 lang: C returncode: 0 @@ -48984,7 +50216,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 3026 -location: clients/tests/test-client.py:test_004()/832 +location: clients/tests/test-client.py:test_004()/864 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -49093,7 +50325,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 907 -location: clients/tests/test-client.py:test_004()/833 +location: clients/tests/test-client.py:test_004()/865 cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0 lang: C returncode: 0 @@ -49126,7 +50358,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar <<< size: 917 -location: clients/tests/test-client.py:test_004()/834 +location: clients/tests/test-client.py:test_004()/866 cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -49159,7 +50391,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar <<< size: 3048 -location: clients/tests/test-client.py:test_004()/835 +location: clients/tests/test-client.py:test_004()/867 cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 @@ -49265,7 +50497,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 3085 -location: clients/tests/test-client.py:test_004()/836 +location: clients/tests/test-client.py:test_004()/868 cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -49371,7 +50603,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 1148 -location: clients/tests/test-client.py:test_004()/837 +location: clients/tests/test-client.py:test_004()/869 cmd: $NMCLI --mode multiline --terse dev lldp list ifname eth0 lang: C returncode: 0 @@ -49401,7 +50633,7 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES:40 (wlan-access-point,telephone) <<< size: 1158 -location: clients/tests/test-client.py:test_004()/838 +location: clients/tests/test-client.py:test_004()/870 cmd: $NMCLI --mode multiline --terse dev lldp list ifname eth0 lang: pl_PL.UTF-8 returncode: 0 @@ -49429,9 +50661,57 @@ NEIGHBOR[2].SYSTEM-NAME:test3.example.com NEIGHBOR[2].SYSTEM-DESCRIPTION:Test system #3 NEIGHBOR[2].SYSTEM-CAPABILITIES:40 (wlan-access-point,telephone) +<<< +size: 789 +location: clients/tests/test-client.py:test_004()/871 +cmd: $NMCLI --mode multiline --terse -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: C +returncode: 0 +stdout: 406 bytes +>>> +connection.id:con-1 +connection.uuid:5fcfd6d7-1e63-3332-8826-a7eda103792d +connection.type:802-3-ethernet +connection.interface-name: + +connection.id:con-vpn-1 +connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.type:vpn +connection.interface-name: +vpn.user-name: + +connection.id:con-xx1 +connection.uuid:UUID-con-xx1-REPLACED-REPLACED-REPLA +connection.type:802-11-wireless +connection.interface-name: + +<<< +size: 799 +location: clients/tests/test-client.py:test_004()/872 +cmd: $NMCLI --mode multiline --terse -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 406 bytes +>>> +connection.id:con-1 +connection.uuid:5fcfd6d7-1e63-3332-8826-a7eda103792d +connection.type:802-3-ethernet +connection.interface-name: + +connection.id:con-vpn-1 +connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.type:vpn +connection.interface-name: +vpn.user-name: + +connection.id:con-xx1 +connection.uuid:UUID-con-xx1-REPLACED-REPLACED-REPLA +connection.type:802-11-wireless +connection.interface-name: + <<< size: 2527 -location: clients/tests/test-client.py:test_004()/839 +location: clients/tests/test-client.py:test_004()/873 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1 lang: C returncode: 0 @@ -49541,7 +50821,7 @@ VPN.CFG[3]:key3 = val3 <<< size: 2537 -location: clients/tests/test-client.py:test_004()/840 +location: clients/tests/test-client.py:test_004()/874 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -49651,7 +50931,7 @@ VPN.CFG[3]:key3 = val3 <<< size: 2527 -location: clients/tests/test-client.py:test_004()/841 +location: clients/tests/test-client.py:test_004()/875 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1 lang: C returncode: 0 @@ -49761,7 +51041,7 @@ VPN.CFG[3]:key3 = val3 <<< size: 2537 -location: clients/tests/test-client.py:test_004()/842 +location: clients/tests/test-client.py:test_004()/876 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -49871,7 +51151,7 @@ VPN.CFG[3]:key3 = val3 <<< size: 1957 -location: clients/tests/test-client.py:test_004()/843 +location: clients/tests/test-client.py:test_004()/877 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 @@ -49960,7 +51240,7 @@ proxy.pac-script: <<< size: 1967 -location: clients/tests/test-client.py:test_004()/844 +location: clients/tests/test-client.py:test_004()/878 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -50049,7 +51329,7 @@ proxy.pac-script: <<< size: 346 -location: clients/tests/test-client.py:test_004()/845 +location: clients/tests/test-client.py:test_004()/879 cmd: $NMCLI --mode multiline --terse --color yes -f VPN con s con-vpn-1 lang: C returncode: 0 @@ -50064,7 +51344,7 @@ vpn.timeout:0 <<< size: 356 -location: clients/tests/test-client.py:test_004()/846 +location: clients/tests/test-client.py:test_004()/880 cmd: $NMCLI --mode multiline --terse --color yes -f VPN con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -50079,7 +51359,7 @@ vpn.timeout:0 <<< size: 567 -location: clients/tests/test-client.py:test_004()/847 +location: clients/tests/test-client.py:test_004()/881 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL con s con-vpn-1 lang: C returncode: 0 @@ -50101,7 +51381,7 @@ GENERAL.MASTER-PATH: <<< size: 577 -location: clients/tests/test-client.py:test_004()/848 +location: clients/tests/test-client.py:test_004()/882 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -50123,7 +51403,7 @@ GENERAL.MASTER-PATH: <<< size: 598 -location: clients/tests/test-client.py:test_004()/849 +location: clients/tests/test-client.py:test_004()/883 cmd: $NMCLI --mode multiline --terse --color yes dev s lang: C returncode: 0 @@ -50152,7 +51432,7 @@ CONNECTION: <<< size: 608 -location: clients/tests/test-client.py:test_004()/850 +location: clients/tests/test-client.py:test_004()/884 cmd: $NMCLI --mode multiline --terse --color yes dev s lang: pl_PL.UTF-8 returncode: 0 @@ -50181,7 +51461,7 @@ CONNECTION: <<< size: 1507 -location: clients/tests/test-client.py:test_004()/851 +location: clients/tests/test-client.py:test_004()/885 cmd: $NMCLI --mode multiline --terse --color yes -f all dev status lang: C returncode: 0 @@ -50235,7 +51515,7 @@ CON-PATH: <<< size: 1517 -location: clients/tests/test-client.py:test_004()/852 +location: clients/tests/test-client.py:test_004()/886 cmd: $NMCLI --mode multiline --terse --color yes -f all dev status lang: pl_PL.UTF-8 returncode: 0 @@ -50289,7 +51569,7 @@ CON-PATH: <<< size: 4564 -location: clients/tests/test-client.py:test_004()/853 +location: clients/tests/test-client.py:test_004()/887 cmd: $NMCLI --mode multiline --terse --color yes dev show lang: C returncode: 0 @@ -50435,7 +51715,7 @@ IP6.DOMAIN[1]:sear6.fo.x.y <<< size: 4574 -location: clients/tests/test-client.py:test_004()/854 +location: clients/tests/test-client.py:test_004()/888 cmd: $NMCLI --mode multiline --terse --color yes dev show lang: pl_PL.UTF-8 returncode: 0 @@ -50581,7 +51861,7 @@ IP6.DOMAIN[1]:sear6.fo.x.y <<< size: 13246 -location: clients/tests/test-client.py:test_004()/855 +location: clients/tests/test-client.py:test_004()/889 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show lang: C returncode: 0 @@ -51000,7 +52280,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 13292 -location: clients/tests/test-client.py:test_004()/856 +location: clients/tests/test-client.py:test_004()/890 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -51419,7 +52699,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 906 -location: clients/tests/test-client.py:test_004()/857 +location: clients/tests/test-client.py:test_004()/891 cmd: $NMCLI --mode multiline --terse --color yes dev show wlan0 lang: C returncode: 0 @@ -51452,7 +52732,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar <<< size: 916 -location: clients/tests/test-client.py:test_004()/858 +location: clients/tests/test-client.py:test_004()/892 cmd: $NMCLI --mode multiline --terse --color yes dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -51485,7 +52765,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar <<< size: 3241 -location: clients/tests/test-client.py:test_004()/859 +location: clients/tests/test-client.py:test_004()/893 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show wlan0 lang: C returncode: 0 @@ -51594,7 +52874,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 3278 -location: clients/tests/test-client.py:test_004()/860 +location: clients/tests/test-client.py:test_004()/894 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -51703,7 +52983,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 1327 -location: clients/tests/test-client.py:test_004()/861 +location: clients/tests/test-client.py:test_004()/895 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -51751,7 +53031,7 @@ WIFI-PROPERTIES.IBSS-RSN:no <<< size: 1337 -location: clients/tests/test-client.py:test_004()/862 +location: clients/tests/test-client.py:test_004()/896 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -51799,7 +53079,7 @@ WIFI-PROPERTIES.IBSS-RSN:no <<< size: 1327 -location: clients/tests/test-client.py:test_004()/863 +location: clients/tests/test-client.py:test_004()/897 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -51847,7 +53127,7 @@ WIFI-PROPERTIES.IBSS-RSN:no <<< size: 1337 -location: clients/tests/test-client.py:test_004()/864 +location: clients/tests/test-client.py:test_004()/898 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -51895,7 +53175,7 @@ WIFI-PROPERTIES.IBSS-RSN:no <<< size: 682 -location: clients/tests/test-client.py:test_004()/865 +location: clients/tests/test-client.py:test_004()/899 cmd: $NMCLI --mode multiline --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev lang: C returncode: 0 @@ -51919,7 +53199,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5 <<< size: 692 -location: clients/tests/test-client.py:test_004()/866 +location: clients/tests/test-client.py:test_004()/900 cmd: $NMCLI --mode multiline --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev lang: pl_PL.UTF-8 returncode: 0 @@ -51943,7 +53223,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5 <<< size: 2171 -location: clients/tests/test-client.py:test_004()/867 +location: clients/tests/test-client.py:test_004()/901 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list lang: C returncode: 0 @@ -52022,7 +53302,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4 <<< size: 2229 -location: clients/tests/test-client.py:test_004()/868 +location: clients/tests/test-client.py:test_004()/902 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -52101,7 +53381,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4 <<< size: 979 -location: clients/tests/test-client.py:test_004()/869 +location: clients/tests/test-client.py:test_004()/903 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list lang: C returncode: 0 @@ -52148,7 +53428,7 @@ SECURITY:WPA1 WPA2 <<< size: 1025 -location: clients/tests/test-client.py:test_004()/870 +location: clients/tests/test-client.py:test_004()/904 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -52195,7 +53475,7 @@ SECURITY:WPA1 WPA2 <<< size: 2284 -location: clients/tests/test-client.py:test_004()/871 +location: clients/tests/test-client.py:test_004()/905 cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: C returncode: 0 @@ -52274,7 +53554,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4 <<< size: 2342 -location: clients/tests/test-client.py:test_004()/872 +location: clients/tests/test-client.py:test_004()/906 cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -52353,7 +53633,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4 <<< size: 722 -location: clients/tests/test-client.py:test_004()/873 +location: clients/tests/test-client.py:test_004()/907 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -52381,7 +53661,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2 <<< size: 744 -location: clients/tests/test-client.py:test_004()/874 +location: clients/tests/test-client.py:test_004()/908 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -52409,7 +53689,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2 <<< size: 407 -location: clients/tests/test-client.py:test_004()/875 +location: clients/tests/test-client.py:test_004()/909 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -52429,7 +53709,7 @@ SECURITY:WPA1 WPA2 <<< size: 426 -location: clients/tests/test-client.py:test_004()/876 +location: clients/tests/test-client.py:test_004()/910 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -52449,7 +53729,7 @@ SECURITY:WPA1 WPA2 <<< size: 835 -location: clients/tests/test-client.py:test_004()/877 +location: clients/tests/test-client.py:test_004()/911 cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -52477,7 +53757,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2 <<< size: 857 -location: clients/tests/test-client.py:test_004()/878 +location: clients/tests/test-client.py:test_004()/912 cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -52505,7 +53785,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2 <<< size: 3244 -location: clients/tests/test-client.py:test_004()/879 +location: clients/tests/test-client.py:test_004()/913 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0 lang: C returncode: 0 @@ -52614,7 +53894,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 3281 -location: clients/tests/test-client.py:test_004()/880 +location: clients/tests/test-client.py:test_004()/914 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -52723,7 +54003,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 919 -location: clients/tests/test-client.py:test_004()/881 +location: clients/tests/test-client.py:test_004()/915 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device show wlan0 lang: C returncode: 0 @@ -52756,7 +54036,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar <<< size: 929 -location: clients/tests/test-client.py:test_004()/882 +location: clients/tests/test-client.py:test_004()/916 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -52789,7 +54069,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar <<< size: 3303 -location: clients/tests/test-client.py:test_004()/883 +location: clients/tests/test-client.py:test_004()/917 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 @@ -52895,7 +54175,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 3340 -location: clients/tests/test-client.py:test_004()/884 +location: clients/tests/test-client.py:test_004()/918 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -53001,7 +54281,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con- <<< size: 1160 -location: clients/tests/test-client.py:test_004()/885 +location: clients/tests/test-client.py:test_004()/919 cmd: $NMCLI --mode multiline --terse --color yes dev lldp list ifname eth0 lang: C returncode: 0 @@ -53031,7 +54311,7 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES:40 (wlan-access-point,telephone) <<< size: 1170 -location: clients/tests/test-client.py:test_004()/886 +location: clients/tests/test-client.py:test_004()/920 cmd: $NMCLI --mode multiline --terse --color yes dev lldp list ifname eth0 lang: pl_PL.UTF-8 returncode: 0 @@ -53060,3 +54340,51 @@ NEIGHBOR[2].SYSTEM-DESCRIPTION:Test system #3 NEIGHBOR[2].SYSTEM-CAPABILITIES:40 (wlan-access-point,telephone) <<< +size: 801 +location: clients/tests/test-client.py:test_004()/921 +cmd: $NMCLI --mode multiline --terse --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: C +returncode: 0 +stdout: 406 bytes +>>> +connection.id:con-1 +connection.uuid:5fcfd6d7-1e63-3332-8826-a7eda103792d +connection.type:802-3-ethernet +connection.interface-name: + +connection.id:con-vpn-1 +connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.type:vpn +connection.interface-name: +vpn.user-name: + +connection.id:con-xx1 +connection.uuid:UUID-con-xx1-REPLACED-REPLACED-REPLA +connection.type:802-11-wireless +connection.interface-name: + +<<< +size: 811 +location: clients/tests/test-client.py:test_004()/922 +cmd: $NMCLI --mode multiline --terse --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 406 bytes +>>> +connection.id:con-1 +connection.uuid:5fcfd6d7-1e63-3332-8826-a7eda103792d +connection.type:802-3-ethernet +connection.interface-name: + +connection.id:con-vpn-1 +connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.type:vpn +connection.interface-name: +vpn.user-name: + +connection.id:con-xx1 +connection.uuid:UUID-con-xx1-REPLACED-REPLACED-REPLA +connection.type:802-11-wireless +connection.interface-name: + +<<< diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index 4a0201ccca..2742824cee 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -1210,6 +1210,8 @@ class TestNmcli(NmTestBase): 'VpnState', dbus.UInt32(NM.VpnConnectionState.ACTIVATED)) + uuids = Util.replace_text_sort_list([ c[1] for c in self.srv.findConnections() ], replace_uuids) + for mode in Util.iter_nmcli_output_modes(): self.call_nmcli_l(mode + ['con', 's', 'con-vpn-1'], @@ -1280,6 +1282,11 @@ class TestNmcli(NmTestBase): self.call_nmcli_l(mode + ['dev', 'lldp', 'list', 'ifname', 'eth0'], replace_stdout = replace_uuids) + self.call_nmcli_l(mode + ['-f', 'connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name', 'connection', 'show' ] + uuids, + replace_stdout = replace_uuids, + replace_cmd = replace_uuids) + + ############################################################################### def main(): From f5b0713651f8603f93be82a47b22ed578762f5eb Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 13 Dec 2019 12:06:20 +0100 Subject: [PATCH 090/109] shared/glib: reimplement g_atomic_pointer_compare_and_exchange() macro With glib 2.63.2 and clang 9.0.0 (Fedora 32) we get compile errors: ../clients/cloud-setup/nmcs-provider-ec2.c:51:8: error: incompatible pointer types passing 'typeof ((((void *)0))) *' (aka 'void **') to parameter of type 'const char **' [-Werror,-Wincompatible-pointer-types] if (!g_atomic_pointer_compare_and_exchange (&base_cached, NULL, base)) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/glib-2.0/glib/gatomic.h:192:44: note: expanded from macro 'g_atomic_pointer_compare_and_exchange' __atomic_compare_exchange_n ((atomic), &gapcae_oldval, (newval), FALSE, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) ? TRUE : FALSE; \ ^~~~~~~~~~~~~~ ../src/devices/bluetooth/nm-bluez-manager.c:2836:2: error: incompatible pointer types passing 'typeof ((((void *)0))) *' (aka 'void **') to parameter of type 'const NMBtVTableNetworkServer **' (aka 'const struct _NMBtVTableNetworkServer **') [-Werror,-Wincompatible-pointer-types] g_atomic_pointer_compare_and_exchange (&nm_bt_vtable_network_server, NULL, &priv->vtable_network_server); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/glib-2.0/glib/gatomic.h:192:44: note: expanded from macro 'g_atomic_pointer_compare_and_exchange' __atomic_compare_exchange_n ((atomic), &gapcae_oldval, (newval), FALSE, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) ? TRUE : FALSE; \ ^~~~~~~~~~~~~~ ../src/devices/bluetooth/nm-bluez-manager.c:2853:2: error: passing 'typeof ((&priv->vtable_network_server)) *' (aka 'struct _NMBtVTableNetworkServer **') to parameter of type 'const NMBtVTableNetworkServer **' (aka 'const struct _NMBtVTableNetworkServer **') discards qualifiers in nested pointer types [-Werror,-Wincompatible-pointer-types-discards-qualifiers] g_atomic_pointer_compare_and_exchange (&nm_bt_vtable_network_server, &priv->vtable_network_server, NULL); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/glib-2.0/glib/gatomic.h:192:44: note: expanded from macro 'g_atomic_pointer_compare_and_exchange' __atomic_compare_exchange_n ((atomic), &gapcae_oldval, (newval), FALSE, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) ? TRUE : FALSE; \ ^~~~~~~~~~~~~~ ../src/devices/nm-device.c:8857:8: error: incompatible pointer types passing 'typeof ((((void *)0))) *' (aka 'void **') to parameter of type 'GBytes **' (aka 'struct _GBytes **') [-Werror,-Wincompatible-pointer-types] if (!g_atomic_pointer_compare_and_exchange (&global_duid, NULL, p)) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/glib-2.0/glib/gatomic.h:192:44: note: expanded from macro 'g_atomic_pointer_compare_and_exchange' __atomic_compare_exchange_n ((atomic), &gapcae_oldval, (newval), FALSE, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) ? TRUE : FALSE; \ ^~~~~~~~~~~~~~ The issue happens because glib passes the "atomic" argument to __atomic_compare_exchange_n ((atomic), &gapcae_oldval, (newval), FALSE, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) without cast, and clang 9 seems to be picky about const pointers. Add our own version of the macro that does better casts while also having better compile time checks for valid arguments. --- shared/nm-glib-aux/nm-glib.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/shared/nm-glib-aux/nm-glib.h b/shared/nm-glib-aux/nm-glib.h index fa44f316c8..dfb75bf05f 100644 --- a/shared/nm-glib-aux/nm-glib.h +++ b/shared/nm-glib-aux/nm-glib.h @@ -575,4 +575,30 @@ _nm_g_value_unset (GValue *value) /*****************************************************************************/ +/* Glib implements g_atomic_pointer_compare_and_exchange() as a macro. + * For one, to inline the atomic operation and also to perform some type checks + * on the arguments. + * Depending on compiler and glib version, glib passes the arguments as they + * are to __atomic_compare_exchange_n(). Some clang version don't accept const + * pointers there. Reimplement the macro to get that right, but with stronger + * type checks (as we use typeof()). Had one job. */ +static inline gboolean +_g_atomic_pointer_compare_and_exchange (volatile void *atomic, + gconstpointer oldval, + gconstpointer newval) +{ + return g_atomic_pointer_compare_and_exchange ((void **) atomic, (void *) oldval, (void *) newval); +} +#undef g_atomic_pointer_compare_and_exchange +#define g_atomic_pointer_compare_and_exchange(atomic, oldval, newval) \ + ({ \ + typeof (atomic) const _atomic = (atomic); \ + typeof (*_atomic) const _oldval = (oldval); \ + typeof (*_atomic) const _newval = (newval); \ + \ + _g_atomic_pointer_compare_and_exchange (_atomic, _oldval, _newval); \ + }) + +/*****************************************************************************/ + #endif /* __NM_GLIB_H__ */ From 0e3400bef730b2c52d48a1d1d4de58e9bcf2dcaa Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 13 Dec 2019 13:41:42 +0100 Subject: [PATCH 091/109] meson/build: avoid using ternary as it breaks older meson See mesonbuild issue 5003. Oddly, this isn't inside a method call, while we use ternaries inside a method calls otherwise. Anyway, workaround this and avoid the crash. Fixes: c21c6bc0be2a ('build/meson: allow configuring default for main.auth-polkit setting') --- meson.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 022a90fec1..faca209e1f 100644 --- a/meson.build +++ b/meson.build @@ -940,7 +940,13 @@ output += ' session tracking: ' + ','.join(session_trackers) + '\n' output += ' suspend/resume: ' + suspend_resume + '\n' output += ' policykit: ' + enable_polkit.to_string() + ' (default: ' + config_auth_polkit_default + ')' if enable_polkit - output += ' (' + (enable_modify_system ? 'permissive' : 'restrictive') + ' modify.system)' + output += ' (' + if enable_modify_system + output += 'permissive' + else + output += 'restrictive' + endif + output += ' modify.system)' endif output += '\n' output += ' polkit agent: ' + enable_polkit_agent.to_string() + '\n' From 13741aa952b57b6cfa60df42ed63a51b2fd59f06 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 12 Dec 2019 09:01:04 +0100 Subject: [PATCH 092/109] cloud-setup/trivial: rename timeout_ms to timeout_msec I think "ms" as abbreviation is too short and unclear. Also, it's not used consistently. Rename variable. --- clients/cloud-setup/nm-cloud-setup-utils.c | 8 ++++---- clients/cloud-setup/nm-cloud-setup-utils.h | 2 +- clients/cloud-setup/nm-http-client.c | 14 +++++++------- clients/cloud-setup/nm-http-client.h | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/clients/cloud-setup/nm-cloud-setup-utils.c b/clients/cloud-setup/nm-cloud-setup-utils.c index 9051e6f20e..50a5989225 100644 --- a/clients/cloud-setup/nm-cloud-setup-utils.c +++ b/clients/cloud-setup/nm-cloud-setup-utils.c @@ -156,7 +156,7 @@ _wait_for_objects_iterate_until_done_idle_cb (gpointer user_data) /** * nmcs_wait_for_objects_iterate_until_done: * @context: the #GMainContext to iterate. - * @timeout_ms: timeout or -1 for no timeout. + * @timeout_msec: timeout or -1 for no timeout. * * Iterates the provided @context until all objects that we wait for * are destroyed. @@ -169,7 +169,7 @@ _wait_for_objects_iterate_until_done_idle_cb (gpointer user_data) */ gboolean nmcs_wait_for_objects_iterate_until_done (GMainContext *context, - int timeout_ms) + int timeout_msec) { nm_auto_unref_gmainloop GMainLoop *loop = g_main_loop_new (context, FALSE); nm_auto_destroy_and_unref_gsource GSource *timeout_source = NULL; @@ -189,8 +189,8 @@ nmcs_wait_for_objects_iterate_until_done (GMainContext *context, .got_timeout = FALSE, }; - if (timeout_ms >= 0) { - timeout_source = nm_g_source_attach (nm_g_timeout_source_new (timeout_ms, + if (timeout_msec >= 0) { + timeout_source = nm_g_source_attach (nm_g_timeout_source_new (timeout_msec, G_PRIORITY_DEFAULT, _wait_for_objects_iterate_until_done_timeout_cb, &data, diff --git a/clients/cloud-setup/nm-cloud-setup-utils.h b/clients/cloud-setup/nm-cloud-setup-utils.h index 0fc12bc47d..7c3e267a8b 100644 --- a/clients/cloud-setup/nm-cloud-setup-utils.h +++ b/clients/cloud-setup/nm-cloud-setup-utils.h @@ -50,7 +50,7 @@ void _nm_log_impl_cs (NMLogLevel level, gpointer nmcs_wait_for_objects_register (gpointer target); gboolean nmcs_wait_for_objects_iterate_until_done (GMainContext *context, - int timeout_ms); + int timeout_msec); /*****************************************************************************/ diff --git a/clients/cloud-setup/nm-http-client.c b/clients/cloud-setup/nm-http-client.c index 7a219a3d3a..943310955a 100644 --- a/clients/cloud-setup/nm-http-client.c +++ b/clients/cloud-setup/nm-http-client.c @@ -259,7 +259,7 @@ _get_cancelled_cb (GObject *object, gpointer user_data) void nm_http_client_get (NMHttpClient *self, const char *url, - int timeout_ms, + int timeout_msec, gssize max_data, GCancellable *cancellable, GAsyncReadyCallback callback, @@ -271,7 +271,7 @@ nm_http_client_get (NMHttpClient *self, g_return_if_fail (NM_IS_HTTP_CLIENT (self)); g_return_if_fail (url); g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (timeout_ms >= 0); + g_return_if_fail (timeout_msec >= 0); g_return_if_fail (max_data >= -1); priv = NM_HTTP_CLIENT_GET_PRIVATE (self); @@ -303,9 +303,9 @@ nm_http_client_get (NMHttpClient *self, curl_easy_setopt (edata->ehandle, CURLOPT_WRITEDATA, edata); curl_easy_setopt (edata->ehandle, CURLOPT_PRIVATE, edata); - if (timeout_ms > 0) { + if (timeout_msec > 0) { edata->timeout_source = _source_attach (self, - nm_g_timeout_source_new (timeout_ms, + nm_g_timeout_source_new (timeout_msec, G_PRIORITY_DEFAULT, _get_timeout_cb, edata, @@ -653,15 +653,15 @@ _mhandle_timeout_cb (gpointer user_data) } static int -_mhandle_timerfunction_cb (CURLM *multi, long timeout_ms, void *user_data) +_mhandle_timerfunction_cb (CURLM *multi, long timeout_msec, void *user_data) { NMHttpClient *self = user_data; NMHttpClientPrivate *priv = NM_HTTP_CLIENT_GET_PRIVATE (self); nm_clear_pointer (&priv->mhandle_source_timeout, nm_g_source_destroy_and_unref); - if (timeout_ms >= 0) { + if (timeout_msec >= 0) { priv->mhandle_source_timeout = _source_attach (self, - nm_g_timeout_source_new (NM_MIN (timeout_ms, G_MAXINT), + nm_g_timeout_source_new (NM_MIN (timeout_msec, G_MAXINT), G_PRIORITY_DEFAULT, _mhandle_timeout_cb, self, diff --git a/clients/cloud-setup/nm-http-client.h b/clients/cloud-setup/nm-http-client.h index 5972c55686..86ee938ee6 100644 --- a/clients/cloud-setup/nm-http-client.h +++ b/clients/cloud-setup/nm-http-client.h @@ -27,7 +27,7 @@ GMainContext *nm_http_client_get_main_context (NMHttpClient *self); void nm_http_client_get (NMHttpClient *self, const char *uri, - int timeout_ms, + int timeout_msec, gssize max_data, GCancellable *cancellable, GAsyncReadyCallback callback, From bd9b253540ae283af8f1e6651a7b2a095b1533d4 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 13 Dec 2019 16:54:30 +0100 Subject: [PATCH 093/109] all: rename time related function to spell out nsec/usec/msec/sec The abbreviations "ns" and "ms" seem not very clear to me. Spell them out to nsec/msec. Also, in parts we already used the longer abbreviations, so it wasn't consistent. --- clients/cli/connections.c | 2 +- clients/cli/devices.c | 2 +- clients/cloud-setup/nm-cloud-setup-utils.c | 8 +- libnm/nm-libnm-utils.c | 4 +- libnm/tests/test-remote-settings-client.c | 4 +- shared/nm-glib-aux/nm-shared-utils.c | 12 +-- shared/nm-glib-aux/nm-shared-utils.h | 17 ++-- shared/nm-glib-aux/nm-time-utils.c | 82 +++++++++---------- shared/nm-glib-aux/nm-time-utils.h | 18 ++-- .../nm-glib-aux/tests/test-shared-general.c | 2 +- shared/nm-utils/nm-test-utils.h | 12 +-- src/devices/bluetooth/nm-bluez5-dun.c | 4 +- src/devices/nm-device-ethernet.c | 4 +- src/devices/nm-device-wireguard.c | 20 ++--- src/devices/nm-device.c | 48 +++++------ src/devices/nm-lldp-listener.c | 8 +- src/devices/wifi/nm-device-iwd.c | 4 +- src/devices/wifi/nm-device-wifi-p2p.c | 2 +- src/devices/wifi/nm-device-wifi.c | 14 ++-- src/devices/wifi/nm-wifi-ap.c | 8 +- src/devices/wifi/nm-wifi-p2p-peer.c | 8 +- src/dhcp/nm-dhcp-nettools.c | 14 ++-- src/dhcp/nm-dhcp-systemd.c | 4 +- src/dhcp/nm-dhcp-utils.c | 6 +- src/dns/nm-dns-dnsmasq.c | 6 +- src/ndisc/nm-fake-ndisc.c | 2 +- src/ndisc/nm-lndp-ndisc.c | 4 +- src/ndisc/nm-ndisc.c | 18 ++-- src/ndisc/tests/test-ndisc-fake.c | 12 +-- src/nm-checkpoint.c | 6 +- src/nm-connectivity.c | 6 +- src/nm-core-utils.c | 20 ++--- src/nm-dbus-manager.c | 4 +- src/nm-logging.c | 14 ++-- src/nm-policy.c | 6 +- src/platform/nm-fake-platform.c | 4 +- src/platform/nm-linux-platform.c | 24 +++--- src/platform/nm-platform.c | 34 ++++---- src/platform/nm-platform.h | 6 +- src/platform/tests/test-common.c | 28 +++---- src/platform/tests/test-common.h | 18 ++-- src/platform/tests/test-link.c | 6 +- src/platform/tests/test-route.c | 6 +- src/settings/nm-settings-connection.c | 2 +- src/settings/nm-settings.c | 4 +- src/supplicant/nm-supplicant-interface.c | 12 +-- src/tests/test-core-with-expect.c | 16 ++-- src/tests/test-systemd.c | 2 +- 48 files changed, 286 insertions(+), 281 deletions(-) diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 3297d0af62..25751c10dd 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -7927,7 +7927,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t connection_changed = FALSE; } - source = g_timeout_source_new (10 * NM_UTILS_MSEC_PER_SECOND); + source = g_timeout_source_new (10 * NM_UTILS_MSEC_PER_SEC); g_source_set_callback (source, editor_save_timeout, &timeout, NULL); g_source_attach (source, g_main_loop_get_context (loop)); diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 58a11a3f2d..0a7339bc2c 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -3083,7 +3083,7 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) } if (rescan == NULL || strcmp (rescan, "auto") == 0) { - rescan_cutoff = NM_MAX (nm_utils_get_timestamp_msec () - 30 * NM_UTILS_MSEC_PER_SECOND, 0); + rescan_cutoff = NM_MAX (nm_utils_get_timestamp_msec () - 30 * NM_UTILS_MSEC_PER_SEC, 0); } else if (strcmp (rescan, "no") == 0) { rescan_cutoff = 0; } else if (strcmp (rescan, "yes") == 0) { diff --git a/clients/cloud-setup/nm-cloud-setup-utils.c b/clients/cloud-setup/nm-cloud-setup-utils.c index 50a5989225..872ab44d3a 100644 --- a/clients/cloud-setup/nm-cloud-setup-utils.c +++ b/clients/cloud-setup/nm-cloud-setup-utils.c @@ -52,8 +52,8 @@ _nm_log_impl_cs (NMLogLevel level, ts = nm_utils_clock_gettime_ns (CLOCK_BOOTTIME); g_print ("[%"G_GINT64_FORMAT".%05"G_GINT64_FORMAT"] %s %s\n", - ts / NM_UTILS_NS_PER_SECOND, - (ts / (NM_UTILS_NS_PER_SECOND / 10000)) % 10000, + ts / NM_UTILS_NSEC_PER_SEC, + (ts / (NM_UTILS_NSEC_PER_SEC / 10000)) % 10000, level_str, msg); } @@ -305,7 +305,7 @@ _poll_done_cb (GObject *source, return; } - now_ms = nm_utils_get_monotonic_timestamp_ms (); + now_ms = nm_utils_get_monotonic_timestamp_msec (); if (poll_task_data->ratelimit_timeout_ms > 0) wait_ms = (poll_task_data->last_poll_start_ms + poll_task_data->ratelimit_timeout_ms) - now_ms; else @@ -328,7 +328,7 @@ _poll_start_cb (gpointer user_data) nm_clear_g_source_inst (&poll_task_data->source_next_poll); - poll_task_data->last_poll_start_ms = nm_utils_get_monotonic_timestamp_ms (); + poll_task_data->last_poll_start_ms = nm_utils_get_monotonic_timestamp_msec (); g_object_ref (poll_task_data->task); /* balanced by _poll_done_cb() */ diff --git a/libnm/nm-libnm-utils.c b/libnm/nm-libnm-utils.c index 662bc33fa5..f223545c78 100644 --- a/libnm/nm-libnm-utils.c +++ b/libnm/nm-libnm-utils.c @@ -93,8 +93,8 @@ _nml_dbus_log (NMLDBusLogLevel level, g_printerr ("libnm-dbus: %s[%"G_GINT64_FORMAT".%05"G_GINT64_FORMAT"] %s\n", prefix, - ts / NM_UTILS_NS_PER_SECOND, - (ts / (NM_UTILS_NS_PER_SECOND / 10000)) % 10000, + ts / NM_UTILS_NSEC_PER_SEC, + (ts / (NM_UTILS_NSEC_PER_SEC / 10000)) % 10000, msg); } diff --git a/libnm/tests/test-remote-settings-client.c b/libnm/tests/test-remote-settings-client.c index 8483eca838..429eecb235 100644 --- a/libnm/tests/test-remote-settings-client.c +++ b/libnm/tests/test-remote-settings-client.c @@ -454,12 +454,12 @@ test_save_hostname (void) nm_client_save_hostname_async (gl.client, "example.com", NULL, save_hostname_cb, &done); - until_ts = nm_utils_get_monotonic_timestamp_ms () + 5000; + until_ts = nm_utils_get_monotonic_timestamp_msec () + 5000; while (TRUE) { g_main_context_iteration (NULL, FALSE); if (done) break; - if (nm_utils_get_monotonic_timestamp_ms () >= until_ts) + if (nm_utils_get_monotonic_timestamp_msec () >= until_ts) g_assert_not_reached (); } diff --git a/shared/nm-glib-aux/nm-shared-utils.c b/shared/nm-glib-aux/nm-shared-utils.c index 8e1c8b5806..d7581f9a65 100644 --- a/shared/nm-glib-aux/nm-shared-utils.c +++ b/shared/nm-glib-aux/nm-shared-utils.c @@ -2223,7 +2223,7 @@ nm_utils_str_utf8safe_escape_take (char *str, NMUtilsStrUtf8SafeFlags flags) /* taken from systemd's fd_wait_for_event(). Note that the timeout * is here in nano-seconds, not micro-seconds. */ int -nm_utils_fd_wait_for_event (int fd, int event, gint64 timeout_ns) +nm_utils_fd_wait_for_event (int fd, int event, gint64 timeout_nsec) { struct pollfd pollfd = { .fd = fd, @@ -2232,11 +2232,11 @@ nm_utils_fd_wait_for_event (int fd, int event, gint64 timeout_ns) struct timespec ts, *pts; int r; - if (timeout_ns < 0) + if (timeout_nsec < 0) pts = NULL; else { - ts.tv_sec = (time_t) (timeout_ns / NM_UTILS_NS_PER_SECOND); - ts.tv_nsec = (long int) (timeout_ns % NM_UTILS_NS_PER_SECOND); + ts.tv_sec = (time_t) (timeout_nsec / NM_UTILS_NSEC_PER_SEC); + ts.tv_nsec = (long int) (timeout_nsec % NM_UTILS_NSEC_PER_SEC); pts = &ts; } @@ -3591,7 +3591,7 @@ nm_g_idle_source_new (int priority, } GSource * -nm_g_timeout_source_new (guint timeout_ms, +nm_g_timeout_source_new (guint timeout_msec, int priority, GSourceFunc func, gpointer user_data, @@ -3599,7 +3599,7 @@ nm_g_timeout_source_new (guint timeout_ms, { GSource *source; - source = g_timeout_source_new (timeout_ms); + source = g_timeout_source_new (timeout_msec); if (priority != G_PRIORITY_DEFAULT) g_source_set_priority (source, priority); g_source_set_callback (source, func, user_data, destroy_notify); diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/shared/nm-glib-aux/nm-shared-utils.h index 3bd1afaea3..0af58c4b6d 100644 --- a/shared/nm-glib-aux/nm-shared-utils.h +++ b/shared/nm-glib-aux/nm-shared-utils.h @@ -978,7 +978,7 @@ GSource *nm_g_idle_source_new (int priority, gpointer user_data, GDestroyNotify destroy_notify); -GSource *nm_g_timeout_source_new (guint timeout_ms, +GSource *nm_g_timeout_source_new (guint timeout_msec, int priority, GSourceFunc func, gpointer user_data, @@ -1182,14 +1182,19 @@ _nm_utils_strv_equal (char **strv1, char **strv2) /*****************************************************************************/ -#define NM_UTILS_NS_PER_SECOND ((gint64) 1000000000) -#define NM_UTILS_NS_PER_MSEC ((gint64) 1000000) -#define NM_UTILS_MSEC_PER_SECOND ((gint64) 1000) -#define NM_UTILS_NS_TO_MSEC_CEIL(nsec) (((nsec) + (NM_UTILS_NS_PER_MSEC - 1)) / NM_UTILS_NS_PER_MSEC) +#define NM_UTILS_NSEC_PER_SEC ((gint64) 1000000000) +#define NM_UTILS_NSEC_PER_MSEC ((gint64) 1000000) +#define NM_UTILS_MSEC_PER_SEC ((gint64) 1000) + +static inline gint64 +NM_UTILS_NSEC_TO_MSEC_CEIL (gint64 nsec) +{ + return (nsec + (NM_UTILS_NSEC_PER_MSEC - 1)) / NM_UTILS_NSEC_PER_MSEC; +} /*****************************************************************************/ -int nm_utils_fd_wait_for_event (int fd, int event, gint64 timeout_ns); +int nm_utils_fd_wait_for_event (int fd, int event, gint64 timeout_nsec); ssize_t nm_utils_fd_read_loop (int fd, void *buf, size_t nbytes, bool do_poll); int nm_utils_fd_read_loop_exact (int fd, void *buf, size_t nbytes, bool do_poll); diff --git a/shared/nm-glib-aux/nm-time-utils.c b/shared/nm-glib-aux/nm-time-utils.c index 20d663bc02..6afaf05aa3 100644 --- a/shared/nm-glib-aux/nm-time-utils.c +++ b/shared/nm-glib-aux/nm-time-utils.c @@ -40,19 +40,19 @@ _t_init_global_state (void) /* The only failure we tolerate is that CLOCK_BOOTTIME is not supported. * Other than that, we rely on kernel to not fail on this. */ g_assert (r == 0); - g_assert (tp.tv_nsec >= 0 && tp.tv_nsec < NM_UTILS_NS_PER_SECOND); + g_assert (tp.tv_nsec >= 0 && tp.tv_nsec < NM_UTILS_NSEC_PER_SEC); /* Calculate an offset for the time stamp. * * We always want positive values, because then we can initialize * a timestamp with 0 and be sure, that it will be less then any * value nm_utils_get_monotonic_timestamp_*() might return. - * For this to be true also for nm_utils_get_monotonic_timestamp_s() at + * For this to be true also for nm_utils_get_monotonic_timestamp_sec() at * early boot, we have to shift the timestamp to start counting at * least from 1 second onward. * * Another advantage of shifting is, that this way we make use of the whole 31 bit - * range of signed int, before the time stamp for nm_utils_get_monotonic_timestamp_s() + * range of signed int, before the time stamp for nm_utils_get_monotonic_timestamp_sec() * wraps (~68 years). **/ offset_sec = (- ((gint64) tp.tv_sec)) + 1; @@ -96,7 +96,7 @@ _t_init_global_state (void) _r = clock_gettime (_p2->clk_id, _tp); \ \ nm_assert (_r == 0); \ - nm_assert (_tp->tv_nsec >= 0 && _tp->tv_nsec < NM_UTILS_NS_PER_SECOND); \ + nm_assert (_tp->tv_nsec >= 0 && _tp->tv_nsec < NM_UTILS_NSEC_PER_SEC); \ \ _p2; \ }) @@ -107,7 +107,7 @@ _t_init_global_state (void) /*****************************************************************************/ /** - * nm_utils_get_monotonic_timestamp_ns: + * nm_utils_get_monotonic_timestamp_nsec: * * Returns: a monotonically increasing time stamp in nanoseconds, * starting at an unspecified offset. See clock_gettime(), %CLOCK_BOOTTIME. @@ -115,11 +115,11 @@ _t_init_global_state (void) * The returned value will start counting at an undefined point * in the past and will always be positive. * - * All the nm_utils_get_monotonic_timestamp_*s functions return the same + * All the nm_utils_get_monotonic_timestamp_*sec functions return the same * timestamp but in different scales (nsec, usec, msec, sec). **/ gint64 -nm_utils_get_monotonic_timestamp_ns (void) +nm_utils_get_monotonic_timestamp_nsec (void) { const GlobalState *p; struct timespec tp; @@ -130,12 +130,12 @@ nm_utils_get_monotonic_timestamp_ns (void) * integer, which makes it easier to calculate time differences (when * you want to subtract signed values). **/ - return (((gint64) tp.tv_sec) + p->offset_sec) * NM_UTILS_NS_PER_SECOND + + return (((gint64) tp.tv_sec) + p->offset_sec) * NM_UTILS_NSEC_PER_SEC + tp.tv_nsec; } /** - * nm_utils_get_monotonic_timestamp_us: + * nm_utils_get_monotonic_timestamp_usec: * * Returns: a monotonically increasing time stamp in microseconds, * starting at an unspecified offset. See clock_gettime(), %CLOCK_BOOTTIME. @@ -143,11 +143,11 @@ nm_utils_get_monotonic_timestamp_ns (void) * The returned value will start counting at an undefined point * in the past and will always be positive. * - * All the nm_utils_get_monotonic_timestamp_*s functions return the same + * All the nm_utils_get_monotonic_timestamp_*sec functions return the same * timestamp but in different scales (nsec, usec, msec, sec). **/ gint64 -nm_utils_get_monotonic_timestamp_us (void) +nm_utils_get_monotonic_timestamp_usec (void) { const GlobalState *p; struct timespec tp; @@ -159,11 +159,11 @@ nm_utils_get_monotonic_timestamp_us (void) * you want to subtract signed values). **/ return (((gint64) tp.tv_sec) + p->offset_sec) * ((gint64) G_USEC_PER_SEC) + - (tp.tv_nsec / (NM_UTILS_NS_PER_SECOND/G_USEC_PER_SEC)); + (tp.tv_nsec / (NM_UTILS_NSEC_PER_SEC/G_USEC_PER_SEC)); } /** - * nm_utils_get_monotonic_timestamp_ms: + * nm_utils_get_monotonic_timestamp_msec: * * Returns: a monotonically increasing time stamp in milliseconds, * starting at an unspecified offset. See clock_gettime(), %CLOCK_BOOTTIME. @@ -171,11 +171,11 @@ nm_utils_get_monotonic_timestamp_us (void) * The returned value will start counting at an undefined point * in the past and will always be positive. * - * All the nm_utils_get_monotonic_timestamp_*s functions return the same + * All the nm_utils_get_monotonic_timestamp_*sec functions return the same * timestamp but in different scales (nsec, usec, msec, sec). **/ gint64 -nm_utils_get_monotonic_timestamp_ms (void) +nm_utils_get_monotonic_timestamp_msec (void) { const GlobalState *p; struct timespec tp; @@ -187,23 +187,23 @@ nm_utils_get_monotonic_timestamp_ms (void) * you want to subtract signed values). **/ return (((gint64) tp.tv_sec) + p->offset_sec) * ((gint64) 1000) + - (tp.tv_nsec / (NM_UTILS_NS_PER_SECOND/1000)); + (tp.tv_nsec / (NM_UTILS_NSEC_PER_SEC/1000)); } /** - * nm_utils_get_monotonic_timestamp_s: + * nm_utils_get_monotonic_timestamp_sec: * - * Returns: nm_utils_get_monotonic_timestamp_ms() in seconds (throwing + * Returns: nm_utils_get_monotonic_timestamp_msec() in seconds (throwing * away sub second parts). The returned value will always be positive. * * This value wraps after roughly 68 years which should be fine for any * practical purpose. * - * All the nm_utils_get_monotonic_timestamp_*s functions return the same + * All the nm_utils_get_monotonic_timestamp_*sec functions return the same * timestamp but in different scales (nsec, usec, msec, sec). **/ gint32 -nm_utils_get_monotonic_timestamp_s (void) +nm_utils_get_monotonic_timestamp_sec (void) { const GlobalState *p; struct timespec tp; @@ -216,13 +216,13 @@ nm_utils_get_monotonic_timestamp_s (void) /** * nm_utils_monotonic_timestamp_as_boottime: * @timestamp: the monotonic-timestamp that should be converted into CLOCK_BOOTTIME. - * @timestamp_ns_per_tick: How many nanoseconds make one unit of @timestamp? E.g. if - * @timestamp is in unit seconds, pass %NM_UTILS_NS_PER_SECOND; if @timestamp is - * in nanoseconds, pass 1; if @timestamp is in milliseconds, pass %NM_UTILS_NS_PER_SECOND/1000. - * This must be a multiple of 10, and between 1 and %NM_UTILS_NS_PER_SECOND. + * @timestamp_nsec_per_tick: How many nanoseconds make one unit of @timestamp? E.g. if + * @timestamp is in unit seconds, pass %NM_UTILS_NSEC_PER_SEC; if @timestamp is + * in nanoseconds, pass 1; if @timestamp is in milliseconds, pass %NM_UTILS_NSEC_PER_SEC/1000. + * This must be a multiple of 10, and between 1 and %NM_UTILS_NSEC_PER_SEC. * * Returns: the monotonic-timestamp as CLOCK_BOOTTIME, as returned by clock_gettime(). - * The unit is the same as the passed in @timestamp based on @timestamp_ns_per_tick. + * The unit is the same as the passed in @timestamp based on @timestamp_nsec_per_tick. * E.g. if you passed @timestamp in as seconds, it will return boottime in seconds. * * Note that valid monotonic-timestamps are always positive numbers (counting roughly since @@ -234,16 +234,16 @@ nm_utils_get_monotonic_timestamp_s (void) * On older kernels that don't support CLOCK_BOOTTIME, the returned time is instead CLOCK_MONOTONIC. **/ gint64 -nm_utils_monotonic_timestamp_as_boottime (gint64 timestamp, gint64 timestamp_ns_per_tick) +nm_utils_monotonic_timestamp_as_boottime (gint64 timestamp, gint64 timestamp_nsec_per_tick) { const GlobalState *p; gint64 offset; - /* only support ns-per-tick being a multiple of 10. */ - g_return_val_if_fail (timestamp_ns_per_tick == 1 - || (timestamp_ns_per_tick > 0 && - timestamp_ns_per_tick <= NM_UTILS_NS_PER_SECOND && - timestamp_ns_per_tick % 10 == 0), + /* only support nsec-per-tick being a multiple of 10. */ + g_return_val_if_fail ( timestamp_nsec_per_tick == 1 + || (timestamp_nsec_per_tick > 0 && + timestamp_nsec_per_tick <= NM_UTILS_NSEC_PER_SEC && + timestamp_nsec_per_tick % 10 == 0), -1); /* if the caller didn't yet ever fetch a monotonic-timestamp, he cannot pass any meaningful @@ -255,7 +255,7 @@ nm_utils_monotonic_timestamp_as_boottime (gint64 timestamp, gint64 timestamp_ns_ nm_assert (p->offset_sec <= 0); /* calculate the offset of monotonic-timestamp to boottime. offset_s is <= 1. */ - offset = p->offset_sec * (NM_UTILS_NS_PER_SECOND / timestamp_ns_per_tick); + offset = p->offset_sec * (NM_UTILS_NSEC_PER_SEC / timestamp_nsec_per_tick); nm_assert (offset <= 0 && offset > G_MININT64); @@ -270,9 +270,9 @@ nm_utils_monotonic_timestamp_as_boottime (gint64 timestamp, gint64 timestamp_ns_ * @boottime: the timestamp from CLOCK_BOOTTIME (or CLOCK_MONOTONIC, if * kernel does not support CLOCK_BOOTTIME and monotonic timestamps are based * on CLOCK_MONOTONIC). - * @timestamp_ns_per_tick: the scale in which @boottime is. If @boottime is in + * @timestamp_nsec_per_tick: the scale in which @boottime is. If @boottime is in * nano seconds, this should be 1. If it is in milli seconds, this should be - * %NM_UTILS_NS_PER_SECOND/1000, etc. + * %NM_UTILS_NSEC_PER_SEC/1000, etc. * * Returns: the same timestamp in monotonic timestamp scale. * @@ -284,16 +284,16 @@ nm_utils_monotonic_timestamp_as_boottime (gint64 timestamp, gint64 timestamp_ns_ * This is the inverse of nm_utils_monotonic_timestamp_as_boottime(). */ gint64 -nm_utils_monotonic_timestamp_from_boottime (guint64 boottime, gint64 timestamp_ns_per_tick) +nm_utils_monotonic_timestamp_from_boottime (guint64 boottime, gint64 timestamp_nsec_per_tick) { const GlobalState *p; gint64 offset; - /* only support ns-per-tick being a multiple of 10. */ - g_return_val_if_fail (timestamp_ns_per_tick == 1 - || (timestamp_ns_per_tick > 0 && - timestamp_ns_per_tick <= NM_UTILS_NS_PER_SECOND && - timestamp_ns_per_tick % 10 == 0), + /* only support nsec-per-tick being a multiple of 10. */ + g_return_val_if_fail ( timestamp_nsec_per_tick == 1 + || (timestamp_nsec_per_tick > 0 && + timestamp_nsec_per_tick <= NM_UTILS_NSEC_PER_SEC && + timestamp_nsec_per_tick % 10 == 0), -1); p = _t_get_global_state (); @@ -301,7 +301,7 @@ nm_utils_monotonic_timestamp_from_boottime (guint64 boottime, gint64 timestamp_n nm_assert (p->offset_sec <= 0); /* calculate the offset of monotonic-timestamp to boottime. offset_s is <= 1. */ - offset = p->offset_sec * (NM_UTILS_NS_PER_SECOND / timestamp_ns_per_tick); + offset = p->offset_sec * (NM_UTILS_NSEC_PER_SEC / timestamp_nsec_per_tick); nm_assert (offset <= 0 && offset > G_MININT64); diff --git a/shared/nm-glib-aux/nm-time-utils.h b/shared/nm-glib-aux/nm-time-utils.h index 8bf41b96a1..fe48be0aed 100644 --- a/shared/nm-glib-aux/nm-time-utils.h +++ b/shared/nm-glib-aux/nm-time-utils.h @@ -11,7 +11,7 @@ static inline gint64 nm_utils_timespec_to_ns (const struct timespec *ts) { - return (((gint64) ts->tv_sec) * ((gint64) NM_UTILS_NS_PER_SECOND)) + return (((gint64) ts->tv_sec) * ((gint64) NM_UTILS_NSEC_PER_SEC)) + ((gint64) ts->tv_nsec); } @@ -19,21 +19,21 @@ static inline gint64 nm_utils_timespec_to_ms (const struct timespec *ts) { return (((gint64) ts->tv_sec) * ((gint64) 1000)) - + (((gint64) ts->tv_nsec) / ((gint64) NM_UTILS_NS_PER_SECOND / 1000)); + + (((gint64) ts->tv_nsec) / ((gint64) NM_UTILS_NSEC_PER_SEC / 1000)); } -gint64 nm_utils_get_monotonic_timestamp_ns (void); -gint64 nm_utils_get_monotonic_timestamp_us (void); -gint64 nm_utils_get_monotonic_timestamp_ms (void); -gint32 nm_utils_get_monotonic_timestamp_s (void); -gint64 nm_utils_monotonic_timestamp_as_boottime (gint64 timestamp, gint64 timestamp_ticks_per_ns); -gint64 nm_utils_monotonic_timestamp_from_boottime (guint64 boottime, gint64 timestamp_ns_per_tick); +gint64 nm_utils_get_monotonic_timestamp_nsec (void); +gint64 nm_utils_get_monotonic_timestamp_usec (void); +gint64 nm_utils_get_monotonic_timestamp_msec (void); +gint32 nm_utils_get_monotonic_timestamp_sec (void); +gint64 nm_utils_monotonic_timestamp_as_boottime (gint64 timestamp, gint64 timestamp_ticks_per_nsec); +gint64 nm_utils_monotonic_timestamp_from_boottime (guint64 boottime, gint64 timestamp_nsec_per_tick); static inline gint64 nm_utils_get_monotonic_timestamp_ns_cached (gint64 *cache_now) { return (*cache_now) - ?: (*cache_now = nm_utils_get_monotonic_timestamp_ns ()); + ?: (*cache_now = nm_utils_get_monotonic_timestamp_nsec ()); } gint64 nm_utils_clock_gettime_ns (clockid_t clockid); diff --git a/shared/nm-glib-aux/tests/test-shared-general.c b/shared/nm-glib-aux/tests/test-shared-general.c index 34da19b32f..a6721c362d 100644 --- a/shared/nm-glib-aux/tests/test-shared-general.c +++ b/shared/nm-glib-aux/tests/test-shared-general.c @@ -44,7 +44,7 @@ test_gpid (void) static void test_monotonic_timestamp (void) { - g_assert (nm_utils_get_monotonic_timestamp_s () > 0); + g_assert (nm_utils_get_monotonic_timestamp_sec () > 0); } /*****************************************************************************/ diff --git a/shared/nm-utils/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h index f0ea11790d..fd90c3b5e7 100644 --- a/shared/nm-utils/nm-test-utils.h +++ b/shared/nm-utils/nm-test-utils.h @@ -622,7 +622,7 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_ #ifdef __NETWORKMANAGER_UTILS_H__ /* ensure that monotonic timestamp is called (because it initially logs a line) */ - nm_utils_get_monotonic_timestamp_s (); + nm_utils_get_monotonic_timestamp_sec (); #endif #ifdef NM_UTILS_H @@ -978,13 +978,13 @@ _nmtst_main_loop_run_timeout (gpointer user_data) } static inline gboolean -nmtst_main_loop_run (GMainLoop *loop, guint timeout_ms) +nmtst_main_loop_run (GMainLoop *loop, guint timeout_msec) { nm_auto_unref_gsource GSource *source = NULL; GMainLoop *loopx = loop; - if (timeout_ms > 0) { - source = g_timeout_source_new (timeout_ms); + if (timeout_msec > 0) { + source = g_timeout_source_new (timeout_msec); g_source_set_callback (source, _nmtst_main_loop_run_timeout, &loopx, NULL); g_source_attach (source, g_main_loop_get_context (loop)); } @@ -1020,13 +1020,13 @@ _nmtst_main_context_iterate_until_timeout (gpointer user_data) return G_SOURCE_CONTINUE; } -#define nmtst_main_context_iterate_until(context, timeout_ms, condition) \ +#define nmtst_main_context_iterate_until(context, timeout_msec, condition) \ G_STMT_START { \ nm_auto_destroy_and_unref_gsource GSource *_source = NULL; \ GMainContext *_context = (context); \ gboolean _had_timeout = FALSE; \ \ - _source = g_timeout_source_new (timeout_ms); \ + _source = g_timeout_source_new (timeout_msec); \ g_source_set_callback (_source, _nmtst_main_context_iterate_until_timeout, &_had_timeout, NULL); \ g_source_attach (_source, _context); \ \ diff --git a/src/devices/bluetooth/nm-bluez5-dun.c b/src/devices/bluetooth/nm-bluez5-dun.c index 72582fae99..063c3db575 100644 --- a/src/devices/bluetooth/nm-bluez5-dun.c +++ b/src/devices/bluetooth/nm-bluez5-dun.c @@ -145,7 +145,7 @@ _connect_open_tty_retry_cb (gpointer user_data) if (r >= 0) return G_SOURCE_REMOVE; - if (nm_utils_get_monotonic_timestamp_ns () > context->cdat->connect_open_tty_started_at + (30 * 100 * NM_UTILS_NS_PER_MSEC)) { + if (nm_utils_get_monotonic_timestamp_nsec () > context->cdat->connect_open_tty_started_at + (30 * 100 * NM_UTILS_NSEC_PER_MSEC)) { gs_free_error GError *error = NULL; context->cdat->source_id = 0; @@ -179,7 +179,7 @@ _connect_open_tty (NMBluez5DunContext *context) context->rfcomm_tty_no, nm_strerror_native (errsv), errsv); - context->cdat->connect_open_tty_started_at = nm_utils_get_monotonic_timestamp_ns (); + context->cdat->connect_open_tty_started_at = nm_utils_get_monotonic_timestamp_nsec (); context->cdat->source_id = g_timeout_add (100, _connect_open_tty_retry_cb, context); diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index 6b80c4ed49..c7c42eaa27 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -920,7 +920,7 @@ act_stage1_prepare (NMDevice *device, NMDeviceStateReason *out_failure_reason) * otherwise after restart the device won't work for the first seconds. */ if (priv->last_pppoe_time != 0) { - gint32 delay = nm_utils_get_monotonic_timestamp_s () - priv->last_pppoe_time; + gint32 delay = nm_utils_get_monotonic_timestamp_sec () - priv->last_pppoe_time; if ( delay < PPPOE_RECONNECT_DELAY && nm_device_get_applied_setting (device, NM_TYPE_SETTING_PPPOE)) { @@ -1468,7 +1468,7 @@ deactivate (NMDevice *device) /* Set last PPPoE connection time */ if (nm_device_get_applied_setting (device, NM_TYPE_SETTING_PPPOE)) - priv->last_pppoe_time = nm_utils_get_monotonic_timestamp_s (); + priv->last_pppoe_time = nm_utils_get_monotonic_timestamp_sec (); } static gboolean diff --git a/src/devices/nm-device-wireguard.c b/src/devices/nm-device-wireguard.c index c916fa4658..a5fce0a604 100644 --- a/src/devices/nm-device-wireguard.c +++ b/src/devices/nm-device-wireguard.c @@ -51,7 +51,7 @@ G_STATIC_ASSERT (NM_WIREGUARD_SYMMETRIC_KEY_LEN == NMP_WIREGUARD_SYMMETRIC_KEY_L /*****************************************************************************/ -#define LINK_CONFIG_RATE_LIMIT_NSEC (50 * NM_UTILS_NS_PER_MSEC) +#define LINK_CONFIG_RATE_LIMIT_NSEC (50 * NM_UTILS_NSEC_PER_MSEC) /* a special @next_try_at_nsec timestamp indicating that we should try again as soon as possible. */ #define NEXT_TRY_AT_NSEC_ASAP ((gint64) G_MAXINT64) @@ -80,7 +80,7 @@ typedef struct { NMSockAddrUnion sockaddr; - /* the timestamp (in nm_utils_get_monotonic_timestamp_ns() scale) when we want + /* the timestamp (in nm_utils_get_monotonic_timestamp_nsec() scale) when we want * to retry resolving the endpoint (again). * * It may be set to %NEXT_TRY_AT_NSEC_ASAP to indicate to re-resolve as soon as possible. @@ -555,7 +555,7 @@ _peers_resolve_retry_timeout (gpointer user_data) _LOGT (LOGD_DEVICE, "wireguard-peers: rechecking peer endpoints..."); - now = nm_utils_get_monotonic_timestamp_ns (); + now = nm_utils_get_monotonic_timestamp_nsec (); next = G_MAXINT64; c_list_for_each_entry (peer_data, &priv->lst_peers_head, lst_peers) { if (peer_data->ep_resolv.next_try_at_nsec <= 0) @@ -606,11 +606,11 @@ _peers_resolve_retry_reschedule (NMDeviceWireGuard *self, return; } - now = nm_utils_get_monotonic_timestamp_ns (); + now = nm_utils_get_monotonic_timestamp_nsec (); /* schedule at most one day ahead. No problem if we expire earlier * than expected. Also, rate-limit to 500 msec. */ - interval_ms = NM_CLAMP ((new_next_try_at_nsec - now) / NM_UTILS_NS_PER_MSEC, + interval_ms = NM_CLAMP ((new_next_try_at_nsec - now) / NM_UTILS_NSEC_PER_MSEC, (gint64) 500, (gint64) (24*60*60*1000)); @@ -636,8 +636,8 @@ _peers_resolve_retry_reschedule_for_peer (NMDeviceWireGuard *self, return; } - peer_data->ep_resolv.next_try_at_nsec = nm_utils_get_monotonic_timestamp_ns () - + (retry_in_msec * NM_UTILS_NS_PER_MSEC); + peer_data->ep_resolv.next_try_at_nsec = nm_utils_get_monotonic_timestamp_nsec () + + (retry_in_msec * NM_UTILS_NSEC_PER_MSEC); _peers_resolve_retry_reschedule (self, peer_data->ep_resolv.next_try_at_nsec); } @@ -1370,7 +1370,7 @@ link_config (NMDeviceWireGuard *self, s_wg = NM_SETTING_WIREGUARD (nm_connection_get_setting (connection, NM_TYPE_SETTING_WIREGUARD)); g_return_val_if_fail (s_wg, NM_ACT_STAGE_RETURN_FAILURE); - priv->link_config_last_at = nm_utils_get_monotonic_timestamp_ns (); + priv->link_config_last_at = nm_utils_get_monotonic_timestamp_nsec (); _LOGT (LOGD_DEVICE, "wireguard link config (%s, %s)...", reason, _link_config_mode_to_string (config_mode)); @@ -1475,12 +1475,12 @@ link_config_delayed (NMDeviceWireGuard *self, priv->link_config_delayed_id = 0; if (priv->link_config_last_at != 0) { - now = nm_utils_get_monotonic_timestamp_ns (); + now = nm_utils_get_monotonic_timestamp_nsec (); if (now < priv->link_config_last_at + LINK_CONFIG_RATE_LIMIT_NSEC) { /* we ratelimit calls to link_config(), because we call this whenever a resolver * completes. */ _LOGT (LOGD_DEVICE, "wireguard link config (%s) (postponed)", reason); - priv->link_config_delayed_id = g_timeout_add (NM_MAX ((priv->link_config_last_at + LINK_CONFIG_RATE_LIMIT_NSEC - now) / NM_UTILS_NS_PER_MSEC, + priv->link_config_delayed_id = g_timeout_add (NM_MAX ((priv->link_config_last_at + LINK_CONFIG_RATE_LIMIT_NSEC - now) / NM_UTILS_NSEC_PER_MSEC, (gint64) 1), link_config_delayed_ratelimit_cb, self); diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 3b595938df..381f68874d 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -2641,17 +2641,17 @@ concheck_periodic_schedule_do (NMDevice *self, int addr_family, gint64 now_ns) * Before calling concheck_periodic_schedule_do(), make sure that these properties are * correct. */ - expiry = priv->concheck_x[IS_IPv4].p_cur_basetime_ns + (priv->concheck_x[IS_IPv4].p_cur_interval * NM_UTILS_NS_PER_SECOND); + expiry = priv->concheck_x[IS_IPv4].p_cur_basetime_ns + (priv->concheck_x[IS_IPv4].p_cur_interval * NM_UTILS_NSEC_PER_SEC); tdiff = expiry - now_ns; _LOGT (LOGD_CONCHECK, "connectivity: [IPv%c] periodic-check: %sscheduled in %lld milliseconds (%u seconds interval)", nm_utils_addr_family_to_char (addr_family), periodic_check_disabled ? "re-" : "", - (long long) (tdiff / NM_UTILS_NS_PER_MSEC), + (long long) (tdiff / NM_UTILS_NSEC_PER_MSEC), priv->concheck_x[IS_IPv4].p_cur_interval); priv->concheck_x[IS_IPv4].p_cur_id = - g_timeout_add (NM_MAX ((gint64) 0, tdiff) / NM_UTILS_NS_PER_MSEC, + g_timeout_add (NM_MAX ((gint64) 0, tdiff) / NM_UTILS_NSEC_PER_MSEC, IS_IPv4 ? concheck_ip4_periodic_timeout_cb : concheck_ip6_periodic_timeout_cb, self); return TRUE; @@ -2713,7 +2713,7 @@ concheck_periodic_schedule_set (NMDevice *self, int addr_family, ConcheckSchedul return; } - cur_expiry = priv->concheck_x[IS_IPv4].p_cur_basetime_ns + (priv->concheck_x[IS_IPv4].p_max_interval * NM_UTILS_NS_PER_SECOND); + cur_expiry = priv->concheck_x[IS_IPv4].p_cur_basetime_ns + (priv->concheck_x[IS_IPv4].p_max_interval * NM_UTILS_NSEC_PER_SEC); nm_utils_get_monotonic_timestamp_ns_cached (&now_ns); priv->concheck_x[IS_IPv4].p_cur_interval = priv->concheck_x[IS_IPv4].p_max_interval; @@ -2769,10 +2769,10 @@ concheck_periodic_schedule_set (NMDevice *self, int addr_family, ConcheckSchedul * * We want to reschedule the timeout at exp_expiry (aka now) + cur_interval. */ nm_utils_get_monotonic_timestamp_ns_cached (&now_ns); - exp_expiry = priv->concheck_x[IS_IPv4].p_cur_basetime_ns + (old_interval * NM_UTILS_NS_PER_SECOND); - new_expiry = exp_expiry + (priv->concheck_x[IS_IPv4].p_cur_interval * NM_UTILS_NS_PER_SECOND); + exp_expiry = priv->concheck_x[IS_IPv4].p_cur_basetime_ns + (old_interval * NM_UTILS_NSEC_PER_SEC); + new_expiry = exp_expiry + (priv->concheck_x[IS_IPv4].p_cur_interval * NM_UTILS_NSEC_PER_SEC); tdiff = NM_MAX (new_expiry - now_ns, 0); - priv->concheck_x[IS_IPv4].p_cur_basetime_ns = (now_ns + tdiff) - (priv->concheck_x[IS_IPv4].p_cur_interval * NM_UTILS_NS_PER_SECOND); + priv->concheck_x[IS_IPv4].p_cur_basetime_ns = (now_ns + tdiff) - (priv->concheck_x[IS_IPv4].p_cur_interval * NM_UTILS_NSEC_PER_SEC); if (concheck_periodic_schedule_do (self, addr_family, now_ns)) { handle = concheck_start (self, addr_family, NULL, NULL, TRUE); if (old_interval != priv->concheck_x[IS_IPv4].p_cur_interval) { @@ -2806,9 +2806,9 @@ concheck_periodic_schedule_set (NMDevice *self, int addr_family, ConcheckSchedul * last check, instead of counting from now. The reason is that we want that the times * when we schedule checks be at precise intervals, without including the time it took for * the connectivity check. */ - new_expiry = priv->concheck_x[IS_IPv4].p_cur_basetime_ns + (priv->concheck_x[IS_IPv4].p_cur_interval * NM_UTILS_NS_PER_SECOND); + new_expiry = priv->concheck_x[IS_IPv4].p_cur_basetime_ns + (priv->concheck_x[IS_IPv4].p_cur_interval * NM_UTILS_NSEC_PER_SEC); tdiff = NM_MAX (new_expiry - nm_utils_get_monotonic_timestamp_ns_cached (&now_ns), 0); - priv->concheck_x[IS_IPv4].p_cur_basetime_ns = now_ns + tdiff - (priv->concheck_x[IS_IPv4].p_cur_interval * NM_UTILS_NS_PER_SECOND); + priv->concheck_x[IS_IPv4].p_cur_basetime_ns = now_ns + tdiff - (priv->concheck_x[IS_IPv4].p_cur_interval * NM_UTILS_NSEC_PER_SEC); concheck_periodic_schedule_do (self, addr_family, now_ns); } @@ -3646,7 +3646,7 @@ nm_device_set_carrier (NMDevice *self, gboolean carrier) } else { gint64 now_ms, until_ms; - now_ms = nm_utils_get_monotonic_timestamp_ms (); + now_ms = nm_utils_get_monotonic_timestamp_msec (); until_ms = NM_MAX (now_ms + _get_carrier_wait_ms (self), priv->carrier_wait_until_ms); priv->carrier_defer_id = g_timeout_add (until_ms - now_ms, carrier_disconnected_action_cb, self); _LOGD (LOGD_DEVICE, "carrier: link disconnected (deferring action for %ld milliseconds) (id=%u)", @@ -3742,7 +3742,7 @@ ndisc_set_router_config (NMNDisc *ndisc, NMDevice *self) if (nm_ndisc_get_node_type (ndisc) != NM_NDISC_NODE_TYPE_ROUTER) return; - now = nm_utils_get_monotonic_timestamp_s (); + now = nm_utils_get_monotonic_timestamp_sec (); head_entry = nm_ip6_config_lookup_addresses (priv->ip_config_6); addresses = g_array_sized_new (FALSE, TRUE, sizeof (NMNDiscAddress), @@ -8920,7 +8920,7 @@ dhcp6_get_duid (NMDevice *self, NMConnection *connection, GBytes *hwaddr, gboole duid_out = generate_duid_ll (arp_type, hwaddr_bin, hwaddr_len); else { duid_out = generate_duid_llt (arp_type, hwaddr_bin, hwaddr_len, - nm_utils_host_id_get_timestamp_ns () / NM_UTILS_NS_PER_SECOND); + nm_utils_host_id_get_timestamp_ns () / NM_UTILS_NSEC_PER_SEC); } goto out_good; @@ -9015,7 +9015,7 @@ dhcp6_get_duid (NMDevice *self, NMConnection *connection, GBytes *hwaddr, gboole * before. Let's compute the time (in seconds) from 0 to 3 years; then we'll * subtract it from the host_id timestamp. */ - time = nm_utils_host_id_get_timestamp_ns () / NM_UTILS_NS_PER_SECOND; + time = nm_utils_host_id_get_timestamp_ns () / NM_UTILS_NSEC_PER_SEC; /* don't use too old timestamps. They cannot be expressed in DUID-LLT and * would all be truncated to zero. */ @@ -9785,7 +9785,7 @@ _commit_mtu (NMDevice *self, const NMIP4Config *config) ? "Are the MTU sizes of the slaves large enough?" : "Did you configure the MTU correctly?")); } - priv->carrier_wait_until_ms = nm_utils_get_monotonic_timestamp_ms () + CARRIER_WAIT_TIME_AFTER_MTU_MS; + priv->carrier_wait_until_ms = nm_utils_get_monotonic_timestamp_msec () + CARRIER_WAIT_TIME_AFTER_MTU_MS; } if (ip6_mtu && ip6_mtu != _IP6_MTU_SYS ()) { @@ -9801,7 +9801,7 @@ _commit_mtu (NMDevice *self, const NMIP4Config *config) : ""); success = FALSE; } - priv->carrier_wait_until_ms = nm_utils_get_monotonic_timestamp_ms () + CARRIER_WAIT_TIME_AFTER_MTU_MS; + priv->carrier_wait_until_ms = nm_utils_get_monotonic_timestamp_msec () + CARRIER_WAIT_TIME_AFTER_MTU_MS; } } @@ -12230,7 +12230,7 @@ _rt6_temporary_not_available_set (NMDevice *self, nm_g_slice_free_fcn (IP6RoutesTemporaryNotAvailableData)); } - now_ms = nm_utils_get_monotonic_timestamp_ms (); + now_ms = nm_utils_get_monotonic_timestamp_msec (); oldest_ms = now_ms; for (i = 0; i < temporary_not_available->len; i++) { @@ -13267,14 +13267,14 @@ nm_device_bring_up (NMDevice *self, gboolean block, gboolean *no_firmware) device_is_up = nm_device_is_up (self); if (block && !device_is_up) { - gint64 wait_until = nm_utils_get_monotonic_timestamp_us () + 10000 /* microseconds */; + gint64 wait_until = nm_utils_get_monotonic_timestamp_usec () + 10000 /* microseconds */; do { g_usleep (200); if (!nm_platform_link_refresh (nm_device_get_platform (self), ifindex)) return FALSE; device_is_up = nm_device_is_up (self); - } while (!device_is_up && nm_utils_get_monotonic_timestamp_us () < wait_until); + } while (!device_is_up && nm_utils_get_monotonic_timestamp_usec () < wait_until); } if (!device_is_up) { @@ -13309,7 +13309,7 @@ nm_device_bring_up (NMDevice *self, gboolean block, gboolean *no_firmware) if (!priv->carrier) nm_device_add_pending_action (self, NM_PENDING_ACTION_CARRIER_WAIT, FALSE); - now_ms = nm_utils_get_monotonic_timestamp_ms (); + now_ms = nm_utils_get_monotonic_timestamp_msec (); until_ms = NM_MAX (now_ms + _get_carrier_wait_ms (self), priv->carrier_wait_until_ms); priv->carrier_wait_id = g_timeout_add (until_ms - now_ms, carrier_wait_timeout, self); } @@ -13352,14 +13352,14 @@ nm_device_take_down (NMDevice *self, gboolean block) device_is_up = nm_device_is_up (self); if (block && device_is_up) { - gint64 wait_until = nm_utils_get_monotonic_timestamp_us () + 10000 /* microseconds */; + gint64 wait_until = nm_utils_get_monotonic_timestamp_usec () + 10000 /* microseconds */; do { g_usleep (200); if (!nm_platform_link_refresh (nm_device_get_platform (self), ifindex)) return; device_is_up = nm_device_is_up (self); - } while (device_is_up && nm_utils_get_monotonic_timestamp_us () < wait_until); + } while (device_is_up && nm_utils_get_monotonic_timestamp_usec () < wait_until); } if (device_is_up) { @@ -15151,7 +15151,7 @@ nm_device_cleanup (NMDevice *self, NMDeviceStateReason reason, CleanupType clean (guint) priv->mtu_initial, (guint) priv->ip6_mtu_initial, ifindex); if (priv->mtu_initial) { nm_platform_link_set_mtu (nm_device_get_platform (self), ifindex, priv->mtu_initial); - priv->carrier_wait_until_ms = nm_utils_get_monotonic_timestamp_ms () + CARRIER_WAIT_TIME_AFTER_MTU_MS; + priv->carrier_wait_until_ms = nm_utils_get_monotonic_timestamp_msec () + CARRIER_WAIT_TIME_AFTER_MTU_MS; } if (priv->ip6_mtu_initial) { char sbuf[64]; @@ -16319,7 +16319,7 @@ again: * * wait/poll up to 100 msec until it changes. */ - poll_end = nm_utils_get_monotonic_timestamp_us () + (100 * 1000); + poll_end = nm_utils_get_monotonic_timestamp_usec () + (100 * 1000); for (;;) { if (!nm_platform_link_refresh (nm_device_get_platform (self), nm_device_get_ip_ifindex (self))) goto handle_fail; @@ -16330,7 +16330,7 @@ again: break; handle_wait: - now = nm_utils_get_monotonic_timestamp_us (); + now = nm_utils_get_monotonic_timestamp_usec (); if (now < poll_end) { g_usleep (NM_MIN (poll_end - now, 500)); continue; diff --git a/src/devices/nm-lldp-listener.c b/src/devices/nm-lldp-listener.c index 4c9e77056d..9201660f53 100644 --- a/src/devices/nm-lldp-listener.c +++ b/src/devices/nm-lldp-listener.c @@ -17,7 +17,7 @@ #include "systemd/nm-sd.h" #define MAX_NEIGHBORS 4096 -#define MIN_UPDATE_INTERVAL_NS (2 * NM_UTILS_NS_PER_SECOND) +#define MIN_UPDATE_INTERVAL_NS (2 * NM_UTILS_NSEC_PER_SEC) #define LLDP_MAC_NEAREST_BRIDGE ((const struct ether_addr *) ((uint8_t[ETH_ALEN]) { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x0e })) #define LLDP_MAC_NEAREST_NON_TPMR_BRIDGE ((const struct ether_addr *) ((uint8_t[ETH_ALEN]) { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x03 })) @@ -828,7 +828,7 @@ data_changed_timeout (gpointer user_data) priv = NM_LLDP_LISTENER_GET_PRIVATE (self); priv->ratelimit_id = 0; - priv->ratelimit_next = nm_utils_get_monotonic_timestamp_ns() + MIN_UPDATE_INTERVAL_NS; + priv->ratelimit_next = nm_utils_get_monotonic_timestamp_nsec() + MIN_UPDATE_INTERVAL_NS; data_changed_notify (self, priv); return G_SOURCE_REMOVE; } @@ -839,13 +839,13 @@ data_changed_schedule (NMLldpListener *self) NMLldpListenerPrivate *priv = NM_LLDP_LISTENER_GET_PRIVATE (self); gint64 now; - now = nm_utils_get_monotonic_timestamp_ns (); + now = nm_utils_get_monotonic_timestamp_nsec (); if (now >= priv->ratelimit_next) { nm_clear_g_source (&priv->ratelimit_id); priv->ratelimit_next = now + MIN_UPDATE_INTERVAL_NS; data_changed_notify (self, priv); } else if (!priv->ratelimit_id) - priv->ratelimit_id = g_timeout_add (NM_UTILS_NS_TO_MSEC_CEIL (priv->ratelimit_next - now), data_changed_timeout, self); + priv->ratelimit_id = g_timeout_add (NM_UTILS_NSEC_TO_MSEC_CEIL (priv->ratelimit_next - now), data_changed_timeout, self); } static void diff --git a/src/devices/wifi/nm-device-iwd.c b/src/devices/wifi/nm-device-iwd.c index 6b587e3f3b..356f590faa 100644 --- a/src/devices/wifi/nm-device-iwd.c +++ b/src/devices/wifi/nm-device-iwd.c @@ -998,7 +998,7 @@ scan_cb (GObject *source, GAsyncResult *res, gpointer user_data) priv = NM_DEVICE_IWD_GET_PRIVATE (self); priv->scan_requested = FALSE; - priv->last_scan = nm_utils_get_monotonic_timestamp_ms (); + priv->last_scan = nm_utils_get_monotonic_timestamp_msec (); _notify (self, PROP_LAST_SCAN); /* On success, priv->scanning becomes true right before or right @@ -2099,7 +2099,7 @@ get_property (GObject *object, guint prop_id, case PROP_LAST_SCAN: g_value_set_int64 (value, priv->last_scan > 0 - ? nm_utils_monotonic_timestamp_as_boottime (priv->last_scan, NM_UTILS_NS_PER_MSEC) + ? nm_utils_monotonic_timestamp_as_boottime (priv->last_scan, NM_UTILS_NSEC_PER_MSEC) : (gint64) -1); break; default: diff --git a/src/devices/wifi/nm-device-wifi-p2p.c b/src/devices/wifi/nm-device-wifi-p2p.c index 34ff70fa0e..e3860ebf2f 100644 --- a/src/devices/wifi/nm-device-wifi-p2p.c +++ b/src/devices/wifi/nm-device-wifi-p2p.c @@ -104,7 +104,7 @@ peer_list_dump (gpointer user_data) if (_LOGD_ENABLED (LOGD_WIFI_SCAN)) { NMWifiP2PPeer *peer; - gint32 now_s = nm_utils_get_monotonic_timestamp_s (); + gint32 now_s = nm_utils_get_monotonic_timestamp_sec (); _LOGD (LOGD_WIFI_SCAN, "P2P Peers: [now:%u]", now_s); c_list_for_each_entry (peer, &priv->peers_lst_head, peers_lst) diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c index 65ba2bcc0f..75b9943c80 100644 --- a/src/devices/wifi/nm-device-wifi.c +++ b/src/devices/wifi/nm-device-wifi.c @@ -1047,7 +1047,7 @@ _hw_addr_set_scanning (NMDeviceWifi *self, gboolean do_reset) return; } - now = nm_utils_get_monotonic_timestamp_s (); + now = nm_utils_get_monotonic_timestamp_sec (); if (now >= priv->hw_addr_scan_expire) { gs_free char *generate_mac_address_mask = NULL; @@ -1188,7 +1188,7 @@ _nm_device_wifi_request_scan (NMDeviceWifi *self, } last_scan = nm_supplicant_interface_get_last_scan (priv->sup_iface); - if (last_scan && (nm_utils_get_monotonic_timestamp_ms () - last_scan) < 10 * NM_UTILS_MSEC_PER_SECOND) { + if (last_scan && (nm_utils_get_monotonic_timestamp_msec () - last_scan) < 10 * NM_UTILS_MSEC_PER_SEC) { g_dbus_method_invocation_return_error_literal (invocation, NM_DEVICE_ERROR, NM_DEVICE_ERROR_NOT_ALLOWED, @@ -1419,7 +1419,7 @@ static void schedule_scan (NMDeviceWifi *self, gboolean backoff) { NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self); - gint32 now = nm_utils_get_monotonic_timestamp_s (); + gint32 now = nm_utils_get_monotonic_timestamp_sec (); /* Cancel the pending scan if it would happen later than (now + the scan_interval) */ if (priv->pending_scan_id) { @@ -1466,7 +1466,7 @@ supplicant_iface_scan_done_cb (NMSupplicantInterface *iface, _LOGD (LOGD_WIFI, "wifi-scan: scan-done callback: %s", success ? "successful" : "failed"); - priv->last_scan = nm_utils_get_monotonic_timestamp_ms (); + priv->last_scan = nm_utils_get_monotonic_timestamp_msec (); _notify (self, PROP_LAST_SCAN); schedule_scan (self, success); @@ -1488,11 +1488,11 @@ ap_list_dump (gpointer user_data) if (_LOGD_ENABLED (LOGD_WIFI_SCAN)) { NMWifiAP *ap; - gint32 now_s = nm_utils_get_monotonic_timestamp_s (); + gint32 now_s = nm_utils_get_monotonic_timestamp_sec (); _LOGD (LOGD_WIFI_SCAN, "APs: [now:%u last:%" G_GINT64_FORMAT " next:%u]", now_s, - priv->last_scan / NM_UTILS_MSEC_PER_SECOND, + priv->last_scan / NM_UTILS_MSEC_PER_SEC, priv->scheduled_scan_time); c_list_for_each_entry (ap, &priv->aps_lst_head, aps_lst) _ap_dump (self, LOGL_DEBUG, ap, "dump", now_s); @@ -3255,7 +3255,7 @@ get_property (GObject *object, guint prop_id, case PROP_LAST_SCAN: g_value_set_int64 (value, priv->last_scan > 0 - ? nm_utils_monotonic_timestamp_as_boottime (priv->last_scan, NM_UTILS_NS_PER_MSEC) + ? nm_utils_monotonic_timestamp_as_boottime (priv->last_scan, NM_UTILS_NSEC_PER_MSEC) : (gint64) -1); break; default: diff --git a/src/devices/wifi/nm-wifi-ap.c b/src/devices/wifi/nm-wifi-ap.c index b4e07ff9be..e07fde543a 100644 --- a/src/devices/wifi/nm-wifi-ap.c +++ b/src/devices/wifi/nm-wifi-ap.c @@ -58,7 +58,7 @@ struct _NMWifiAPPrivate { /* Non-scanned attributes */ bool fake:1; /* Whether or not the AP is from a scan */ bool hotspot:1; /* Whether the AP is a local device's hotspot network */ - gint32 last_seen; /* Timestamp when the AP was seen lastly (obtained via nm_utils_get_monotonic_timestamp_s()) */ + gint32 last_seen; /* Timestamp when the AP was seen lastly (obtained via nm_utils_get_monotonic_timestamp_sec()) */ }; typedef struct _NMWifiAPPrivate NMWifiAPPrivate; @@ -898,7 +898,7 @@ nm_wifi_ap_update_from_properties (NMWifiAP *ap, changed = TRUE; } - changed |= nm_wifi_ap_set_last_seen (ap, nm_utils_get_monotonic_timestamp_s ()); + changed |= nm_wifi_ap_set_last_seen (ap, nm_utils_get_monotonic_timestamp_sec ()); changed |= nm_wifi_ap_set_fake (ap, FALSE); g_object_thaw_notify (G_OBJECT (ap)); @@ -1026,7 +1026,7 @@ nm_wifi_ap_to_string (const NMWifiAP *self, priv->metered ? 'M' : '_', priv->wpa_flags & 0xFFFF, priv->rsn_flags & 0xFFFF, - priv->last_seen > 0 ? ((now_s > 0 ? now_s : nm_utils_get_monotonic_timestamp_s ()) - priv->last_seen) : -1, + priv->last_seen > 0 ? ((now_s > 0 ? now_s : nm_utils_get_monotonic_timestamp_sec ()) - priv->last_seen) : -1, supplicant_id, export_path); return str_buf; @@ -1180,7 +1180,7 @@ get_property (GObject *object, guint prop_id, case PROP_LAST_SEEN: g_value_set_int (value, priv->last_seen > 0 - ? (int) nm_utils_monotonic_timestamp_as_boottime (priv->last_seen, NM_UTILS_NS_PER_SECOND) + ? (int) nm_utils_monotonic_timestamp_as_boottime (priv->last_seen, NM_UTILS_NSEC_PER_SEC) : -1); break; default: diff --git a/src/devices/wifi/nm-wifi-p2p-peer.c b/src/devices/wifi/nm-wifi-p2p-peer.c index f8da004669..ccdd56c4fd 100644 --- a/src/devices/wifi/nm-wifi-p2p-peer.c +++ b/src/devices/wifi/nm-wifi-p2p-peer.c @@ -55,7 +55,7 @@ struct _NMWifiP2PPeerPrivate { NM80211ApFlags flags; /* General flags */ /* Non-scanned attributes */ - gint32 last_seen; /* Timestamp when the Peer was seen lastly (obtained via nm_utils_get_monotonic_timestamp_s()) */ + gint32 last_seen; /* Timestamp when the Peer was seen lastly (obtained via nm_utils_get_monotonic_timestamp_sec()) */ }; typedef struct _NMWifiP2PPeerPrivate NMWifiP2PPeerPrivate; @@ -499,7 +499,7 @@ nm_wifi_p2p_peer_update_from_properties (NMWifiP2PPeer *peer, changed = TRUE; } - changed |= nm_wifi_p2p_peer_set_last_seen (peer, nm_utils_get_monotonic_timestamp_s ()); + changed |= nm_wifi_p2p_peer_set_last_seen (peer, nm_utils_get_monotonic_timestamp_sec ()); g_object_thaw_notify (G_OBJECT (peer)); @@ -537,7 +537,7 @@ nm_wifi_p2p_peer_to_string (const NMWifiP2PPeer *self, priv->model, priv->model_number, priv->serial, - priv->last_seen > 0 ? ((now_s > 0 ? now_s : nm_utils_get_monotonic_timestamp_s ()) - priv->last_seen) : -1, + priv->last_seen > 0 ? ((now_s > 0 ? now_s : nm_utils_get_monotonic_timestamp_sec ()) - priv->last_seen) : -1, supplicant_id, export_path); @@ -616,7 +616,7 @@ get_property (GObject *object, guint prop_id, case PROP_LAST_SEEN: g_value_set_int (value, priv->last_seen > 0 - ? (int) nm_utils_monotonic_timestamp_as_boottime (priv->last_seen, NM_UTILS_NS_PER_SECOND) + ? (int) nm_utils_monotonic_timestamp_as_boottime (priv->last_seen, NM_UTILS_NSEC_PER_SEC) : -1); break; default: diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/dhcp/nm-dhcp-nettools.c index e557c00487..654bdf5031 100644 --- a/src/dhcp/nm-dhcp-nettools.c +++ b/src/dhcp/nm-dhcp-nettools.c @@ -373,8 +373,8 @@ lease_parse_address (NDhcp4ClientLease *lease, * Here we still do it... it seems safe enough. */ nm_assert (nettools_basetime > 0); nm_assert (nettools_lifetime >= nettools_basetime); - nm_assert (((nettools_lifetime - nettools_basetime) % NM_UTILS_NS_PER_SECOND) == 0); - nm_assert ((nettools_lifetime - nettools_basetime) / NM_UTILS_NS_PER_SECOND <= G_MAXUINT32); + nm_assert (((nettools_lifetime - nettools_basetime) % NM_UTILS_NSEC_PER_SEC) == 0); + nm_assert ((nettools_lifetime - nettools_basetime) / NM_UTILS_NSEC_PER_SEC <= G_MAXUINT32); if (nettools_lifetime <= nettools_basetime) { /* A lease time of 0 is allowed on some dhcp servers, so, let's accept it. */ @@ -384,7 +384,7 @@ lease_parse_address (NDhcp4ClientLease *lease, /* we "ceil" the value to the next second. In practice, we don't expect any sub-second values * from n-dhcp4 anyway, so this should have no effect. */ - lifetime += NM_UTILS_NS_PER_SECOND - 1; + lifetime += NM_UTILS_NSEC_PER_SEC - 1; } ts = nm_utils_monotonic_timestamp_from_boottime (nettools_basetime, 1); @@ -392,11 +392,11 @@ lease_parse_address (NDhcp4ClientLease *lease, /* the timestamp must be positive, because we only started nettools DHCP client * after obtaining the first monotonic timestamp. Hence, the lease must have been * received afterwards. */ - nm_assert (ts >= NM_UTILS_NS_PER_SECOND); + nm_assert (ts >= NM_UTILS_NSEC_PER_SEC); - a_timestamp = ts / NM_UTILS_NS_PER_SECOND; - a_lifetime = NM_MIN (lifetime / NM_UTILS_NS_PER_SECOND, NM_PLATFORM_LIFETIME_PERMANENT - 1); - a_expiry = time (NULL) + ((lifetime - (nm_utils_clock_gettime_ns (CLOCK_BOOTTIME) - nettools_basetime)) / NM_UTILS_NS_PER_SECOND); + a_timestamp = ts / NM_UTILS_NSEC_PER_SEC; + a_lifetime = NM_MIN (lifetime / NM_UTILS_NSEC_PER_SEC, NM_PLATFORM_LIFETIME_PERMANENT - 1); + a_expiry = time (NULL) + ((lifetime - (nm_utils_clock_gettime_ns (CLOCK_BOOTTIME) - nettools_basetime)) / NM_UTILS_NSEC_PER_SEC); } if (!lease_get_in_addr (lease, NM_DHCP_OPTION_DHCP4_SUBNET_MASK, &a_netmask)) { diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c index 1518d46576..b5ebd1bc98 100644 --- a/src/dhcp/nm-dhcp-systemd.c +++ b/src/dhcp/nm-dhcp-systemd.c @@ -93,7 +93,7 @@ lease_to_ip4_config (NMDedupMultiIndex *multi_idx, gboolean has_router_from_classless = FALSE; gboolean has_classless_route = FALSE; gboolean has_static_route = FALSE; - const gint32 ts = nm_utils_get_monotonic_timestamp_s (); + const gint32 ts = nm_utils_get_monotonic_timestamp_sec (); gint64 ts_time = time (NULL); struct in_addr a_address; struct in_addr a_netmask; @@ -803,7 +803,7 @@ static void bound6_handle (NMDhcpSystemd *self) { NMDhcpSystemdPrivate *priv = NM_DHCP_SYSTEMD_GET_PRIVATE (self); - const gint32 ts = nm_utils_get_monotonic_timestamp_s (); + const gint32 ts = nm_utils_get_monotonic_timestamp_sec (); const char *iface = nm_dhcp_client_get_iface (NM_DHCP_CLIENT (self)); gs_unref_object NMIP6Config *ip6_config = NULL; gs_unref_hashtable GHashTable *options = NULL; diff --git a/src/dhcp/nm-dhcp-utils.c b/src/dhcp/nm-dhcp-utils.c index c5da3e0227..e1c1fa1d85 100644 --- a/src/dhcp/nm-dhcp-utils.c +++ b/src/dhcp/nm-dhcp-utils.c @@ -388,7 +388,7 @@ nm_dhcp_utils_ip4_config_from_options (NMDedupMultiIndex *multi_idx, ip4_config = nm_ip4_config_new (multi_idx, ifindex); memset (&address, 0, sizeof (address)); - address.timestamp = nm_utils_get_monotonic_timestamp_s (); + address.timestamp = nm_utils_get_monotonic_timestamp_sec (); str = g_hash_table_lookup (options, "ip_address"); if (str && (inet_pton (AF_INET, str, &addr) > 0)) @@ -601,7 +601,7 @@ nm_dhcp_utils_ip6_prefix_from_options (GHashTable *options) address.address = tmp_addr; address.addr_source = NM_IP_CONFIG_SOURCE_DHCP; address.plen = prefix; - address.timestamp = nm_utils_get_monotonic_timestamp_s (); + address.timestamp = nm_utils_get_monotonic_timestamp_sec (); str = g_hash_table_lookup (options, "max_life"); if (str) @@ -630,7 +630,7 @@ nm_dhcp_utils_ip6_config_from_options (NMDedupMultiIndex *multi_idx, memset (&address, 0, sizeof (address)); address.plen = 128; - address.timestamp = nm_utils_get_monotonic_timestamp_s (); + address.timestamp = nm_utils_get_monotonic_timestamp_sec (); ip6_config = nm_ip6_config_new (multi_idx, ifindex); diff --git a/src/dns/nm-dns-dnsmasq.c b/src/dns/nm-dns-dnsmasq.c index a5028e426d..e2bd0b790d 100644 --- a/src/dns/nm-dns-dnsmasq.c +++ b/src/dns/nm-dns-dnsmasq.c @@ -129,7 +129,7 @@ _gl_pid_kill_external_timeout_cb (gpointer user_data) goto process_gone; } - now = nm_utils_get_monotonic_timestamp_ms (); + now = nm_utils_get_monotonic_timestamp_msec (); if (gl_pid.kill_external_data->started_at + WAIT_MSEC_AFTER_SIGTERM < now) { if (!gl_pid.kill_external_data->sigkilled) { @@ -240,7 +240,7 @@ handle_kill: gl_pid.kill_external_data = g_slice_new (GlPidKillExternalData); *gl_pid.kill_external_data = (GlPidKillExternalData) { .shutdown_wait_handle = nm_shutdown_wait_obj_register_handle_full (g_strdup_printf ("kill-external-dnsmasq-process-%"G_PID_FORMAT, pid), TRUE), - .started_at = nm_utils_get_monotonic_timestamp_ms (), + .started_at = nm_utils_get_monotonic_timestamp_msec (), .pid = pid, .p_start_time = p_start_time, }; @@ -1058,7 +1058,7 @@ start_dnsmasq (NMDnsDnsmasq *self, gboolean force_start, GError **error) } } - now = nm_utils_get_monotonic_timestamp_ms (); + now = nm_utils_get_monotonic_timestamp_msec (); if ( force_start || priv->burst_start_at == 0 || priv->burst_start_at + RATELIMIT_INTERVAL_MSEC <= now) { diff --git a/src/ndisc/nm-fake-ndisc.c b/src/ndisc/nm-fake-ndisc.c index 020764d3d9..851ff70721 100644 --- a/src/ndisc/nm-fake-ndisc.c +++ b/src/ndisc/nm-fake-ndisc.c @@ -234,7 +234,7 @@ receive_ra (gpointer user_data) NMNDiscDataInternal *rdata = ndisc->rdata; FakeRa *ra = priv->ras->data; NMNDiscConfigMap changed = 0; - gint32 now = nm_utils_get_monotonic_timestamp_s (); + gint32 now = nm_utils_get_monotonic_timestamp_sec (); guint i; NMNDiscDHCPLevel dhcp_level; diff --git a/src/ndisc/nm-lndp-ndisc.c b/src/ndisc/nm-lndp-ndisc.c index 8077099f6f..d052426f4a 100644 --- a/src/ndisc/nm-lndp-ndisc.c +++ b/src/ndisc/nm-lndp-ndisc.c @@ -99,7 +99,7 @@ receive_ra (struct ndp *ndp, struct ndp_msg *msg, gpointer user_data) NMNDiscConfigMap changed = 0; struct ndp_msgra *msgra = ndp_msgra (msg); struct in6_addr gateway_addr; - gint32 now = nm_utils_get_monotonic_timestamp_s (); + gint32 now = nm_utils_get_monotonic_timestamp_sec (); int offset; int hop_limit; guint32 val; @@ -348,7 +348,7 @@ send_ra (NMNDisc *ndisc, GError **error) { NMLndpNDiscPrivate *priv = NM_LNDP_NDISC_GET_PRIVATE ((NMLndpNDisc *) ndisc); NMNDiscDataInternal *rdata = ndisc->rdata; - gint32 now = nm_utils_get_monotonic_timestamp_s (); + gint32 now = nm_utils_get_monotonic_timestamp_sec (); int errsv; struct in6_addr *addr; struct ndp_msg *msg; diff --git a/src/ndisc/nm-ndisc.c b/src/ndisc/nm-ndisc.c index 41201e24aa..7369bacddc 100644 --- a/src/ndisc/nm-ndisc.c +++ b/src/ndisc/nm-ndisc.c @@ -171,7 +171,7 @@ _get_exp (char *buf, gsize buf_size, gint64 now_ns, gint64 expiry_time) return "permanent"; l = g_snprintf (buf, buf_size, "%.4f", - ((double) ((expiry_time * NM_UTILS_NS_PER_SECOND) - now_ns)) / ((double) NM_UTILS_NS_PER_SECOND)); + ((double) ((expiry_time * NM_UTILS_NSEC_PER_SEC) - now_ns)) / ((double) NM_UTILS_NSEC_PER_SEC)); nm_assert (l < buf_size); return buf; } @@ -701,7 +701,7 @@ send_rs_timeout (NMNDisc *ndisc) g_clear_error (&error); } - priv->last_rs = nm_utils_get_monotonic_timestamp_s (); + priv->last_rs = nm_utils_get_monotonic_timestamp_sec (); if (priv->solicitations_left > 0) { _LOGD ("scheduling router solicitation retry in %d seconds.", (int) priv->router_solicitation_interval); @@ -725,7 +725,7 @@ solicit_routers (NMNDisc *ndisc) if (priv->send_rs_id) return; - now = nm_utils_get_monotonic_timestamp_s (); + now = nm_utils_get_monotonic_timestamp_sec (); priv->solicitations_left = priv->router_solicitations; t = (((gint64) priv->last_rs) + priv->router_solicitation_interval) - now; @@ -746,7 +746,7 @@ announce_router (NMNDisc *ndisc) if (!nm_ndisc_netns_push (ndisc, &netns)) return G_SOURCE_REMOVE; - priv->last_ra = nm_utils_get_monotonic_timestamp_s (); + priv->last_ra = nm_utils_get_monotonic_timestamp_sec (); if (klass->send_ra (ndisc, &error)) { _LOGD ("router advertisement sent"); g_clear_pointer (&priv->last_error, g_free); @@ -786,7 +786,7 @@ announce_router_initial (NMNDisc *ndisc) priv->announcements_left = NM_NDISC_ROUTER_ADVERTISEMENTS_DEFAULT; /* Unschedule an unsolicited resend if we are allowed to send now. */ - if (G_LIKELY (nm_utils_get_monotonic_timestamp_s () - priv->last_ra > NM_NDISC_ROUTER_ADVERT_DELAY)) + if (G_LIKELY (nm_utils_get_monotonic_timestamp_sec () - priv->last_ra > NM_NDISC_ROUTER_ADVERT_DELAY)) nm_clear_g_source (&priv->send_ra_id); /* Schedule the initial send rather early. Clamp the delay by minimal @@ -805,7 +805,7 @@ announce_router_solicited (NMNDisc *ndisc) _LOGD ("will send an solicited router advertisement"); /* Unschedule an unsolicited resend if we are allowed to send now. */ - if (nm_utils_get_monotonic_timestamp_s () - priv->last_ra > NM_NDISC_ROUTER_ADVERT_DELAY) + if (nm_utils_get_monotonic_timestamp_sec () - priv->last_ra > NM_NDISC_ROUTER_ADVERT_DELAY) nm_clear_g_source (&priv->send_ra_id); if (!priv->send_ra_id) { @@ -1017,7 +1017,7 @@ _config_changed_log (NMNDisc *ndisc, NMNDiscConfigMap changed) if (!_LOGD_ENABLED ()) return; - now_ns = nm_utils_get_monotonic_timestamp_ns (); + now_ns = nm_utils_get_monotonic_timestamp_nsec (); priv = NM_NDISC_GET_PRIVATE (ndisc); rdata = &priv->rdata; @@ -1231,7 +1231,7 @@ timeout_cb (gpointer user_data) NMNDisc *self = user_data; NM_NDISC_GET_PRIVATE (self)->timeout_id = 0; - check_timestamps (self, nm_utils_get_monotonic_timestamp_s (), 0); + check_timestamps (self, nm_utils_get_monotonic_timestamp_sec (), 0); return G_SOURCE_REMOVE; } @@ -1350,7 +1350,7 @@ nm_ndisc_init (NMNDisc *ndisc) priv->rdata.public.hop_limit = 64; /* Start at very low number so that last_rs - router_solicitation_interval - * is much lower than nm_utils_get_monotonic_timestamp_s() at startup. + * is much lower than nm_utils_get_monotonic_timestamp_sec() at startup. */ priv->last_rs = G_MININT32; } diff --git a/src/ndisc/tests/test-ndisc-fake.c b/src/ndisc/tests/test-ndisc-fake.c index 8bdc053ded..91fe9802d7 100644 --- a/src/ndisc/tests/test-ndisc-fake.c +++ b/src/ndisc/tests/test-ndisc-fake.c @@ -157,7 +157,7 @@ static void test_simple (void) { NMFakeNDisc *ndisc = ndisc_new (); - guint32 now = nm_utils_get_monotonic_timestamp_s (); + guint32 now = nm_utils_get_monotonic_timestamp_sec (); TestData data = { g_main_loop_new (NULL, FALSE), 0, 0, now }; guint id; @@ -239,7 +239,7 @@ static void test_everything (void) { NMFakeNDisc *ndisc = ndisc_new (); - guint32 now = nm_utils_get_monotonic_timestamp_s (); + guint32 now = nm_utils_get_monotonic_timestamp_sec (); TestData data = { g_main_loop_new (NULL, FALSE), 0, 0, now }; guint id; @@ -313,7 +313,7 @@ static void test_preference_order (void) { NMFakeNDisc *ndisc = ndisc_new (); - guint32 now = nm_utils_get_monotonic_timestamp_s (); + guint32 now = nm_utils_get_monotonic_timestamp_sec (); TestData data = { g_main_loop_new (NULL, FALSE), 0, 0, now }; guint id; @@ -386,7 +386,7 @@ static void test_preference_changed (void) { NMFakeNDisc *ndisc = ndisc_new (); - guint32 now = nm_utils_get_monotonic_timestamp_s (); + guint32 now = nm_utils_get_monotonic_timestamp_sec (); TestData data = { g_main_loop_new (NULL, FALSE), 0, 0, now }; guint id; @@ -440,7 +440,7 @@ success_timeout (TestData *data) static void test_dns_solicit_loop_rs_sent (NMFakeNDisc *ndisc, TestData *data) { - guint32 now = nm_utils_get_monotonic_timestamp_s (); + guint32 now = nm_utils_get_monotonic_timestamp_sec (); guint id; if (data->rs_counter > 0 && data->rs_counter < 6) { @@ -472,7 +472,7 @@ static void test_dns_solicit_loop (void) { NMFakeNDisc *ndisc = ndisc_new (); - guint32 now = nm_utils_get_monotonic_timestamp_s (); + guint32 now = nm_utils_get_monotonic_timestamp_sec (); TestData data = { g_main_loop_new (NULL, FALSE), 0, 0, now, 0 }; guint id; diff --git a/src/nm-checkpoint.c b/src/nm-checkpoint.c index 734a40e1e2..1ab0f07d36 100644 --- a/src/nm-checkpoint.c +++ b/src/nm-checkpoint.c @@ -585,7 +585,7 @@ nm_checkpoint_adjust_rollback_timeout (NMCheckpoint *self, guint32 add_timeout) if (add_timeout == 0) rollback_timeout_s = 0; else { - now_ms = nm_utils_get_monotonic_timestamp_ms (); + now_ms = nm_utils_get_monotonic_timestamp_msec (); add_timeout_ms = ((gint64) add_timeout) * 1000; rollback_timeout_ms = (now_ms - priv->created_at_ms) + add_timeout_ms; @@ -626,7 +626,7 @@ get_property (GObject *object, guint prop_id, case PROP_CREATED: g_value_set_int64 (value, nm_utils_monotonic_timestamp_as_boottime (priv->created_at_ms, - NM_UTILS_NS_PER_MSEC)); + NM_UTILS_NSEC_PER_MSEC)); break; case PROP_ROLLBACK_TIMEOUT: g_value_set_uint (value, priv->rollback_timeout_s); @@ -679,7 +679,7 @@ nm_checkpoint_new (NMManager *manager, GPtrArray *devices, guint32 rollback_time priv = NM_CHECKPOINT_GET_PRIVATE (self); priv->manager = g_object_ref (manager); priv->rollback_timeout_s = rollback_timeout_s; - priv->created_at_ms = nm_utils_get_monotonic_timestamp_ms (); + priv->created_at_ms = nm_utils_get_monotonic_timestamp_msec (); priv->flags = flags; if (rollback_timeout_s != 0) { diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c index ccac63766b..bcafc90893 100644 --- a/src/nm-connectivity.c +++ b/src/nm-connectivity.c @@ -415,13 +415,13 @@ _con_curl_timeout_cb (gpointer user_data) } static int -multi_timer_cb (CURLM *multi, long timeout_ms, void *userdata) +multi_timer_cb (CURLM *multi, long timeout_msec, void *userdata) { NMConnectivityCheckHandle *cb_data = userdata; nm_clear_g_source (&cb_data->concheck.curl_timer); - if (timeout_ms != -1) - cb_data->concheck.curl_timer = g_timeout_add (timeout_ms, _con_curl_timeout_cb, cb_data); + if (timeout_msec != -1) + cb_data->concheck.curl_timer = g_timeout_add (timeout_msec, _con_curl_timeout_cb, cb_data); return 0; } diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c index fb92289f0d..1438a0bb5e 100644 --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c @@ -436,7 +436,7 @@ static const char * _kc_waited_to_string (char *buf, gint64 wait_start_us) #define _kc_waited_to_string(buf, wait_start_us) ( G_STATIC_ASSERT_EXPR(sizeof (buf) == KC_WAITED_TO_STRING && sizeof ((buf)[0]) == 1), _kc_waited_to_string (buf, wait_start_us) ) { - g_snprintf (buf, KC_WAITED_TO_STRING, " (%ld usec elapsed)", (long) (nm_utils_get_monotonic_timestamp_us () - wait_start_us)); + g_snprintf (buf, KC_WAITED_TO_STRING, " (%ld usec elapsed)", (long) (nm_utils_get_monotonic_timestamp_usec () - wait_start_us)); return buf; } @@ -476,7 +476,7 @@ _kc_cb_timeout_grace_period (void *user_data) } } else { nm_log_dbg (data->log_domain, "%s: process not terminated after %ld usec. Sending SIGKILL signal", - data->log_name, (long) (nm_utils_get_monotonic_timestamp_us () - data->async.wait_start_us)); + data->log_name, (long) (nm_utils_get_monotonic_timestamp_usec () - data->async.wait_start_us)); } return G_SOURCE_REMOVE; @@ -591,7 +591,7 @@ nm_utils_kill_child_async (pid_t pid, int sig, NMLogDomain log_domain, } data = _kc_async_data_alloc (pid, log_domain, log_name, callback, user_data); - data->async.wait_start_us = nm_utils_get_monotonic_timestamp_us (); + data->async.wait_start_us = nm_utils_get_monotonic_timestamp_usec (); if (sig != SIGKILL && wait_before_kill_msec > 0) { data->async.source_timeout_kill_id = g_timeout_add (wait_before_kill_msec, _kc_cb_timeout_grace_period, data); @@ -694,7 +694,7 @@ nm_utils_kill_child_sync (pid_t pid, int sig, NMLogDomain log_domain, const char goto out; } - wait_start_us = nm_utils_get_monotonic_timestamp_us (); + wait_start_us = nm_utils_get_monotonic_timestamp_usec (); /* wait for the process to terminated... */ if (sig != SIGKILL) { @@ -728,7 +728,7 @@ nm_utils_kill_child_sync (pid_t pid, int sig, NMLogDomain log_domain, const char if (!wait_until) break; - now = nm_utils_get_monotonic_timestamp_us (); + now = nm_utils_get_monotonic_timestamp_usec (); if (now >= wait_until) break; @@ -871,7 +871,7 @@ nm_utils_kill_process_sync (pid_t pid, guint64 start_time, int sig, NMLogDomain /* wait for the process to terminate... */ - wait_start_us = nm_utils_get_monotonic_timestamp_us (); + wait_start_us = nm_utils_get_monotonic_timestamp_usec (); sleep_duration_usec = _sleep_duration_convert_ms_to_us (sleep_duration_msec); if (sig != SIGKILL && wait_before_kill_msec) @@ -922,7 +922,7 @@ nm_utils_kill_process_sync (pid_t pid, guint64 start_time, int sig, NMLogDomain } sleep_time = sleep_duration_usec; - now = nm_utils_get_monotonic_timestamp_us (); + now = nm_utils_get_monotonic_timestamp_usec (); if ( max_wait_until != 0 && now >= max_wait_until) { @@ -2453,13 +2453,13 @@ _host_id_read_timestamp (gboolean use_secret_key_file, * is not stable across restarts, but apparently neither is the host-id * nor the secret_key itself. */ -#define EPOCH_TWO_YEARS (G_GINT64_CONSTANT (2 * 365 * 24 * 3600) * NM_UTILS_NS_PER_SECOND) +#define EPOCH_TWO_YEARS (G_GINT64_CONSTANT (2 * 365 * 24 * 3600) * NM_UTILS_NSEC_PER_SEC) v = nm_hash_siphash42 (1156657133u, host_id, host_id_len); now = time (NULL); *out_timestamp_ns = NM_MAX ((gint64) 1, - (now * NM_UTILS_NS_PER_SECOND) - ((gint64) (v % ((guint64) (EPOCH_TWO_YEARS))))); + (now * NM_UTILS_NSEC_PER_SEC) - ((gint64) (v % ((guint64) (EPOCH_TWO_YEARS))))); return FALSE; } @@ -3721,7 +3721,7 @@ nm_utils_lifetime_get (guint32 timestamp, } if (now <= 0) - now = nm_utils_get_monotonic_timestamp_s (); + now = nm_utils_get_monotonic_timestamp_sec (); t_lifetime = nm_utils_lifetime_rebase_relative_time_on_now (timestamp, lifetime, now); if (!t_lifetime) { diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c index 3f6f8115e2..f2d63b4bdc 100644 --- a/src/nm-dbus-manager.c +++ b/src/nm-dbus-manager.c @@ -523,7 +523,7 @@ _get_caller_info_ensure (NMDBusManager *self, gint64 now_ns; gsize num; -#define CALLER_INFO_MAX_AGE (NM_UTILS_NS_PER_SECOND * 1) +#define CALLER_INFO_MAX_AGE (NM_UTILS_NSEC_PER_SEC * 1) /* Linear search the cache for the sender. * @@ -564,7 +564,7 @@ _get_caller_info_ensure (NMDBusManager *self, } } - now_ns = nm_utils_get_monotonic_timestamp_ns (); + now_ns = nm_utils_get_monotonic_timestamp_nsec (); if ( ensure_uid && (now_ns - caller_info->uid_checked_at) > CALLER_INFO_MAX_AGE) { diff --git a/src/nm-logging.c b/src/nm-logging.c index 34dd2797aa..9e0aa16563 100644 --- a/src/nm-logging.c +++ b/src/nm-logging.c @@ -730,7 +730,7 @@ _nm_log_impl (const char *file, char *iov_free_data[5]; char **iov_free = iov_free_data; - now = nm_utils_get_monotonic_timestamp_ns (); + now = nm_utils_get_monotonic_timestamp_nsec (); boottime = nm_utils_monotonic_timestamp_as_boottime (now, 1); _iovec_set_format_a (iov++, 30, "PRIORITY=%d", level_desc[level].syslog_level); @@ -763,8 +763,8 @@ _nm_log_impl (const char *file, _iovec_set_format (iov++, iov_free++, "CODE_FUNC=%s", func); _iovec_set_format (iov++, iov_free++, "CODE_FILE=%s", file ?: ""); _iovec_set_format_a (iov++, 20, "CODE_LINE=%u", line); - _iovec_set_format_a (iov++, 60, "TIMESTAMP_MONOTONIC=%lld.%06lld", (long long) (now / NM_UTILS_NS_PER_SECOND), (long long) ((now % NM_UTILS_NS_PER_SECOND) / 1000)); - _iovec_set_format_a (iov++, 60, "TIMESTAMP_BOOTTIME=%lld.%06lld", (long long) (boottime / NM_UTILS_NS_PER_SECOND), (long long) ((boottime % NM_UTILS_NS_PER_SECOND) / 1000)); + _iovec_set_format_a (iov++, 60, "TIMESTAMP_MONOTONIC=%lld.%06lld", (long long) (now / NM_UTILS_NSEC_PER_SEC), (long long) ((now % NM_UTILS_NSEC_PER_SEC) / 1000)); + _iovec_set_format_a (iov++, 60, "TIMESTAMP_BOOTTIME=%lld.%06lld", (long long) (boottime / NM_UTILS_NSEC_PER_SEC), (long long) ((boottime % NM_UTILS_NSEC_PER_SEC) / 1000)); if (error != 0) _iovec_set_format_a (iov++, 30, "ERRNO=%d", error); if (ifname) @@ -865,7 +865,7 @@ nm_log_handler (const char *log_domain, { gint64 now, boottime; - now = nm_utils_get_monotonic_timestamp_ns (); + now = nm_utils_get_monotonic_timestamp_nsec (); boottime = nm_utils_monotonic_timestamp_as_boottime (now, 1); sd_journal_send ("PRIORITY=%d", syslog_priority, @@ -875,8 +875,8 @@ nm_log_handler (const char *log_domain, "SYSLOG_FACILITY=3", "GLIB_DOMAIN=%s", log_domain ?: "", "GLIB_LEVEL=%d", (int) (level & G_LOG_LEVEL_MASK), - "TIMESTAMP_MONOTONIC=%lld.%06lld", (long long) (now / NM_UTILS_NS_PER_SECOND), (long long) ((now % NM_UTILS_NS_PER_SECOND) / 1000), - "TIMESTAMP_BOOTTIME=%lld.%06lld", (long long) (boottime / NM_UTILS_NS_PER_SECOND), (long long) ((boottime % NM_UTILS_NS_PER_SECOND) / 1000), + "TIMESTAMP_MONOTONIC=%lld.%06lld", (long long) (now / NM_UTILS_NSEC_PER_SEC), (long long) ((now % NM_UTILS_NSEC_PER_SEC) / 1000), + "TIMESTAMP_BOOTTIME=%lld.%06lld", (long long) (boottime / NM_UTILS_NSEC_PER_SEC), (long long) ((boottime % NM_UTILS_NSEC_PER_SEC) / 1000), NULL); } break; @@ -996,7 +996,7 @@ nm_logging_init (const char *logging_backend, gboolean debug) if (fetch_monotonic_timestamp) { /* ensure we read a monotonic timestamp. Reading the timestamp the first * time causes a logging message. We don't want to do that during _nm_log_impl. */ - nm_utils_get_monotonic_timestamp_ns (); + nm_utils_get_monotonic_timestamp_nsec (); } if (obsolete_debug_backend) diff --git a/src/nm-policy.c b/src/nm-policy.c index d322b2efea..7fd818b675 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -195,7 +195,7 @@ static void expire_ip6_delegations (NMPolicy *self) { NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (self); - guint32 now = nm_utils_get_monotonic_timestamp_s (); + guint32 now = nm_utils_get_monotonic_timestamp_sec (); IP6PrefixDelegation *delegation = NULL; guint i; @@ -1549,7 +1549,7 @@ reset_connections_retries (gpointer user_data) priv->reset_retries_id = 0; min_stamp = 0; - now = nm_utils_get_monotonic_timestamp_s (); + now = nm_utils_get_monotonic_timestamp_sec (); connections = nm_settings_get_connections (priv->settings, NULL); for (i = 0; connections[i]; i++) { NMSettingsConnection *connection = connections[i]; @@ -1594,7 +1594,7 @@ _connection_autoconnect_retries_set (NMPolicy *self, gint32 retry_time = nm_settings_connection_autoconnect_retries_blocked_until (connection); g_warn_if_fail (retry_time != 0); - priv->reset_retries_id = g_timeout_add_seconds (MAX (0, retry_time - nm_utils_get_monotonic_timestamp_s ()), reset_connections_retries, self); + priv->reset_retries_id = g_timeout_add_seconds (MAX (0, retry_time - nm_utils_get_monotonic_timestamp_sec ()), reset_connections_retries, self); } } } diff --git a/src/platform/nm-fake-platform.c b/src/platform/nm-fake-platform.c index 6aae808aeb..9fa2791fec 100644 --- a/src/platform/nm-fake-platform.c +++ b/src/platform/nm-fake-platform.c @@ -980,7 +980,7 @@ ip4_address_add (NMPlatform *platform, address.address = addr; address.peer_address = peer_addr; address.plen = plen; - address.timestamp = nm_utils_get_monotonic_timestamp_s (); + address.timestamp = nm_utils_get_monotonic_timestamp_sec (); address.lifetime = lifetime; address.preferred = preferred; address.n_ifa_flags = flags; @@ -1008,7 +1008,7 @@ ip6_address_add (NMPlatform *platform, address.address = addr; address.peer_address = (IN6_IS_ADDR_UNSPECIFIED (&peer_addr) || IN6_ARE_ADDR_EQUAL (&addr, &peer_addr)) ? in6addr_any : peer_addr; address.plen = plen; - address.timestamp = nm_utils_get_monotonic_timestamp_s (); + address.timestamp = nm_utils_get_monotonic_timestamp_sec (); address.lifetime = lifetime; address.preferred = preferred; address.n_ifa_flags = flags; diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 305ae52e3a..4f8c900491 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -738,7 +738,7 @@ _addrtime_timestamp_to_nm (guint32 timestamp, gint32 *out_now_nm) /* do all the calculations in milliseconds scale */ - now_nm = nm_utils_get_monotonic_timestamp_ms (); + now_nm = nm_utils_get_monotonic_timestamp_msec (); now_nl = nm_utils_clock_gettime_ms (CLOCK_MONOTONIC); nm_assert (now_nm >= 1000); @@ -748,13 +748,13 @@ _addrtime_timestamp_to_nm (guint32 timestamp, gint32 *out_now_nm) NM_SET_OUT (out_now_nm, now_nm / 1000); - /* converting the timestamp into nm_utils_get_monotonic_timestamp_ms() scale is + /* converting the timestamp into nm_utils_get_monotonic_timestamp_msec() scale is * a good guess but fails in the following situations: * * - If the address existed before start of the process, the timestamp in nm scale would * be negative or zero. In this case we default to 1. * - during hibernation, the CLOCK_MONOTONIC/timestamp drifts from - * nm_utils_get_monotonic_timestamp_ms() scale. + * nm_utils_get_monotonic_timestamp_msec() scale. */ if (result <= 1000) return 1; @@ -809,7 +809,7 @@ _addrtime_get_lifetimes (guint32 timestamp, if (now == 0) { /* strange. failed to detect the last-update time and assumed that timestamp is 1. */ nm_assert (timestamp == 1); - now = nm_utils_get_monotonic_timestamp_s (); + now = nm_utils_get_monotonic_timestamp_sec (); } if (timestamp < now) { guint32 diff = now - timestamp; @@ -5030,14 +5030,14 @@ delayed_action_to_string_full (DelayedActionType action_type, gpointer user_data data = user_data; if (data) { - gint64 timeout = data->timeout_abs_ns - nm_utils_get_monotonic_timestamp_ns (); + gint64 timeout = data->timeout_abs_ns - nm_utils_get_monotonic_timestamp_nsec (); char b[255]; nm_utils_strbuf_append (&buf, &buf_size, " (seq %u, timeout in %s%"G_GINT64_FORMAT".%09"G_GINT64_FORMAT", response-type %d%s%s)", data->seq_number, timeout < 0 ? "-" : "", - (timeout < 0 ? -timeout : timeout) / NM_UTILS_NS_PER_SECOND, - (timeout < 0 ? -timeout : timeout) % NM_UTILS_NS_PER_SECOND, + (timeout < 0 ? -timeout : timeout) / NM_UTILS_NSEC_PER_SEC, + (timeout < 0 ? -timeout : timeout) % NM_UTILS_NSEC_PER_SEC, (int) data->response_type, data->seq_result ? ", " : "", data->seq_result ? wait_for_nl_response_to_string (data->seq_result, NULL, b, sizeof (b)) : ""); @@ -5139,7 +5139,7 @@ delayed_action_wait_for_nl_response_complete_check (NMPlatform *platform, if (data->seq_result) delayed_action_wait_for_nl_response_complete (platform, i, data->seq_result); else if ( p_now_ns - && ((now_ns ?: (now_ns = nm_utils_get_monotonic_timestamp_ns ())) >= data->timeout_abs_ns)) { + && ((now_ns ?: (now_ns = nm_utils_get_monotonic_timestamp_nsec ())) >= data->timeout_abs_ns)) { /* the caller can optionally check for timeout by providing a p_now_ns argument. */ delayed_action_wait_for_nl_response_complete (platform, i, WAIT_FOR_NL_RESPONSE_RESULT_FAILED_TIMEOUT); } else if (force_result != WAIT_FOR_NL_RESPONSE_RESULT_UNKNOWN) @@ -5359,7 +5359,7 @@ delayed_action_schedule_WAIT_FOR_NL_RESPONSE (NMPlatform *platform, { DelayedActionWaitForNlResponseData data = { .seq_number = seq_number, - .timeout_abs_ns = nm_utils_get_monotonic_timestamp_ns () + (200 * (NM_UTILS_NS_PER_SECOND / 1000)), + .timeout_abs_ns = nm_utils_get_monotonic_timestamp_nsec () + (200 * (NM_UTILS_NSEC_PER_SEC / 1000)), .out_seq_result = out_seq_result, .out_errmsg = out_errmsg, .response_type = response_type, @@ -8799,7 +8799,7 @@ event_handler_read_netlink (NMPlatform *platform, gboolean wait_for_acks) int r; struct pollfd pfd; gboolean any = FALSE; - int timeout_ms; + int timeout_msec; struct { guint32 seq_number; gint64 timeout_abs_ns; @@ -8880,12 +8880,12 @@ after_read: _LOGT ("netlink: read: wait for ACK for sequence number %u...", next.seq_number); - timeout_ms = (next.timeout_abs_ns - next.now_ns) / (NM_UTILS_NS_PER_SECOND / 1000); + timeout_msec = (next.timeout_abs_ns - next.now_ns) / (NM_UTILS_NSEC_PER_SEC / 1000); memset (&pfd, 0, sizeof (pfd)); pfd.fd = nl_socket_get_fd (priv->nlh); pfd.events = POLLIN; - r = poll (&pfd, 1, MAX (1, timeout_ms)); + r = poll (&pfd, 1, MAX (1, timeout_msec)); if (r == 0) { /* timeout and there is nothing to read. */ diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 6795dde772..2636df9a08 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -4048,7 +4048,7 @@ nm_platform_ip4_address_sync (NMPlatform *self, { gs_unref_ptrarray GPtrArray *plat_addresses = NULL; const NMPlatformIP4Address *known_address; - gint32 now = nm_utils_get_monotonic_timestamp_s (); + gint32 now = nm_utils_get_monotonic_timestamp_sec (); GHashTable *plat_subnets = NULL; GHashTable *known_subnets = NULL; gs_unref_hashtable GHashTable *known_addresses_idx = NULL; @@ -4224,7 +4224,7 @@ nm_platform_ip6_address_sync (NMPlatform *self, gboolean full_sync) { gs_unref_ptrarray GPtrArray *plat_addresses = NULL; - gint32 now = nm_utils_get_monotonic_timestamp_s (); + gint32 now = nm_utils_get_monotonic_timestamp_sec (); guint i_plat, i_know; gs_unref_hashtable GHashTable *known_addresses_idx = NULL; NMPLookup lookup; @@ -4965,15 +4965,15 @@ nm_platform_ip_route_get (NMPlatform *self, #define IP4_DEV_ROUTE_BLACKLIST_GC_TIMEOUT_S ((int) (((IP4_DEV_ROUTE_BLACKLIST_TIMEOUT_MS + 999) * 3) / 1000)) static gint64 -_ip4_dev_route_blacklist_timeout_ms_get (gint64 timeout_ms) +_ip4_dev_route_blacklist_timeout_ms_get (gint64 timeout_msec) { - return timeout_ms >> 1; + return timeout_msec >> 1; } static gint64 -_ip4_dev_route_blacklist_timeout_ms_marked (gint64 timeout_ms) +_ip4_dev_route_blacklist_timeout_ms_marked (gint64 timeout_msec) { - return !!(timeout_ms & ((gint64) 1)); + return !!(timeout_msec & ((gint64) 1)); } static gboolean @@ -4992,7 +4992,7 @@ again: if (!priv->ip4_dev_route_blacklist_hash) goto out; - now_ms = nm_utils_get_monotonic_timestamp_ms (); + now_ms = nm_utils_get_monotonic_timestamp_msec (); g_hash_table_iter_init (&iter, priv->ip4_dev_route_blacklist_hash); while (g_hash_table_iter_next (&iter, (gpointer *) &p_obj, (gpointer *) &p_timeout_ms)) { @@ -5055,7 +5055,7 @@ _ip4_dev_route_blacklist_notify_route (NMPlatform *self, (gpointer *) &p_timeout_ms)) return; - now_ms = nm_utils_get_monotonic_timestamp_ms (); + now_ms = nm_utils_get_monotonic_timestamp_msec (); if (now_ms > _ip4_dev_route_blacklist_timeout_ms_get (*p_timeout_ms)) { /* already expired. Wait for gc. */ return; @@ -5086,7 +5086,7 @@ _ip4_dev_route_blacklist_gc_timeout_handle (gpointer user_data) nm_assert (priv->ip4_dev_route_blacklist_gc_timeout_id); - now_ms = nm_utils_get_monotonic_timestamp_ms (); + now_ms = nm_utils_get_monotonic_timestamp_msec (); g_hash_table_iter_init (&iter, priv->ip4_dev_route_blacklist_hash); while (g_hash_table_iter_next (&iter, (gpointer *) &p_obj, (gpointer *) &p_timeout_ms)) { @@ -5155,8 +5155,8 @@ nm_platform_ip4_dev_route_blacklist_set (NMPlatform *self, GHashTableIter iter; const NMPObject *p_obj; guint i; - gint64 timeout_ms; - gint64 timeout_ms_val; + gint64 timeout_msec; + gint64 timeout_msec_val; gint64 *p_timeout_ms; gboolean needs_check = FALSE; @@ -5191,8 +5191,8 @@ nm_platform_ip4_dev_route_blacklist_set (NMPlatform *self, nm_g_slice_free_fcn_gint64); } - timeout_ms = nm_utils_get_monotonic_timestamp_ms () + IP4_DEV_ROUTE_BLACKLIST_TIMEOUT_MS; - timeout_ms_val = (timeout_ms << 1) | ((gint64) 1); + timeout_msec = nm_utils_get_monotonic_timestamp_msec () + IP4_DEV_ROUTE_BLACKLIST_TIMEOUT_MS; + timeout_msec_val = (timeout_msec << 1) | ((gint64) 1); for (i = 0; i < ip4_dev_route_blacklist->len; i++) { const NMPObject *o; @@ -5206,7 +5206,7 @@ nm_platform_ip4_dev_route_blacklist_set (NMPlatform *self, /* un-expire and reuse the entry. */ _LOGT ("ip4-dev-route: register %s (update)", nmp_object_to_string (p_obj, NMP_OBJECT_TO_STRING_PUBLIC, NULL, 0)); - *p_timeout_ms = timeout_ms_val; + *p_timeout_ms = timeout_msec_val; continue; } } @@ -5214,7 +5214,7 @@ nm_platform_ip4_dev_route_blacklist_set (NMPlatform *self, _LOGT ("ip4-dev-route: register %s", nmp_object_to_string (o, NMP_OBJECT_TO_STRING_PUBLIC, NULL, 0)); p_timeout_ms = g_slice_new (gint64); - *p_timeout_ms = timeout_ms_val; + *p_timeout_ms = timeout_msec_val; g_hash_table_replace (priv->ip4_dev_route_blacklist_hash, (gpointer) nmp_object_ref (o), p_timeout_ms); @@ -6054,7 +6054,7 @@ nm_platform_ip4_address_to_string (const NMPlatformIP4Address *address, char *bu char str_lft[30], str_pref[30], str_time[50], s_source[50]; char *str_peer = NULL; const char *str_lft_p, *str_pref_p, *str_time_p; - gint32 now = nm_utils_get_monotonic_timestamp_s (); + gint32 now = nm_utils_get_monotonic_timestamp_sec (); if (!nm_utils_to_string_buffer_init_null (address, &buf, &len)) return buf; @@ -6167,7 +6167,7 @@ nm_platform_ip6_address_to_string (const NMPlatformIP6Address *address, char *bu char str_dev[TO_STRING_DEV_BUF_SIZE]; char *str_peer = NULL; const char *str_lft_p, *str_pref_p, *str_time_p; - gint32 now = nm_utils_get_monotonic_timestamp_s (); + gint32 now = nm_utils_get_monotonic_timestamp_sec (); if (!nm_utils_to_string_buffer_init_null (address, &buf, &len)) return buf; diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h index 4bd8e34d1e..a31564ed3f 100644 --- a/src/platform/nm-platform.h +++ b/src/platform/nm-platform.h @@ -287,7 +287,7 @@ typedef enum { * 2 @lifetime==@preferred==NM_PLATFORM_LIFETIME_PERMANENT: @timestamp is irrelevant (but mostly * set to 0). Such addresses are permanent. * 3 Non permanent addresses should (almost) always have @timestamp > 0. 0 is not a valid timestamp - * and never returned by nm_utils_get_monotonic_timestamp_s(). In this case @valid/@preferred + * and never returned by nm_utils_get_monotonic_timestamp_sec(). In this case @valid/@preferred * is anchored at @timestamp. * 4 Non permanent addresses with @timestamp == 0 are implicitly anchored at *now*, thus the time * moves as time goes by. This is usually not useful, except e.g. nm_platform_ip[46]_address_add(). @@ -325,7 +325,7 @@ typedef struct { /** * NMPlatformIP4Address: - * @timestamp: timestamp as returned by nm_utils_get_monotonic_timestamp_s() + * @timestamp: timestamp as returned by nm_utils_get_monotonic_timestamp_sec() **/ struct _NMPlatformIP4Address { __NMPlatformIPAddress_COMMON; @@ -349,7 +349,7 @@ struct _NMPlatformIP4Address { /** * NMPlatformIP6Address: - * @timestamp: timestamp as returned by nm_utils_get_monotonic_timestamp_s() + * @timestamp: timestamp as returned by nm_utils_get_monotonic_timestamp_sec() **/ struct _NMPlatformIP6Address { __NMPlatformIPAddress_COMMON; diff --git a/src/platform/tests/test-common.c b/src/platform/tests/test-common.c index b93213ef74..7d31e920b8 100644 --- a/src/platform/tests/test-common.c +++ b/src/platform/tests/test-common.c @@ -553,7 +553,7 @@ _wait_for_signal_timeout (gpointer user_data) } guint -nmtstp_wait_for_signal (NMPlatform *platform, gint64 timeout_ms) +nmtstp_wait_for_signal (NMPlatform *platform, gint64 timeout_msec) { WaitForSignalData data = { 0 }; gulong id_link, id_ip4_address, id_ip6_address, id_ip4_route, id_ip6_route; @@ -568,7 +568,7 @@ nmtstp_wait_for_signal (NMPlatform *platform, gint64 timeout_ms) id_ip4_route = g_signal_connect (platform, NM_PLATFORM_SIGNAL_IP4_ROUTE_CHANGED, G_CALLBACK (_wait_for_signal_cb), &data); id_ip6_route = g_signal_connect (platform, NM_PLATFORM_SIGNAL_IP6_ROUTE_CHANGED, G_CALLBACK (_wait_for_signal_cb), &data); - /* if timeout_ms is negative, it means the wait-time already expired. + /* if timeout_msec is negative, it means the wait-time already expired. * Maybe, we should do nothing and return right away, without even * processing events from platform. However, that inconsistency (of not * processing events from mainloop) is inconvenient. @@ -578,7 +578,7 @@ nmtstp_wait_for_signal (NMPlatform *platform, gint64 timeout_ms) * a zero timeout: we check whether there are any events pending in platform, * and quite the mainloop immediately afterwards. But we always check. */ - data.id = g_timeout_add (CLAMP (timeout_ms, 0, G_MAXUINT32), + data.id = g_timeout_add (CLAMP (timeout_msec, 0, G_MAXUINT32), _wait_for_signal_timeout, &data); g_main_loop_run (data.loop); @@ -603,7 +603,7 @@ nmtstp_wait_for_signal_until (NMPlatform *platform, gint64 until_ms) guint signal_counts; while (TRUE) { - now = nm_utils_get_monotonic_timestamp_ms (); + now = nm_utils_get_monotonic_timestamp_msec (); if (until_ms < now) return 0; @@ -615,11 +615,11 @@ nmtstp_wait_for_signal_until (NMPlatform *platform, gint64 until_ms) } const NMPlatformLink * -nmtstp_wait_for_link (NMPlatform *platform, const char *ifname, NMLinkType expected_link_type, gint64 timeout_ms) +nmtstp_wait_for_link (NMPlatform *platform, const char *ifname, NMLinkType expected_link_type, gint64 timeout_msec) { return nmtstp_wait_for_link_until (platform, ifname, expected_link_type, - timeout_ms - ? nm_utils_get_monotonic_timestamp_ms () + timeout_ms + timeout_msec + ? nm_utils_get_monotonic_timestamp_msec () + timeout_msec : 0); } @@ -633,7 +633,7 @@ nmtstp_wait_for_link_until (NMPlatform *platform, const char *ifname, NMLinkType _init_platform (&platform, FALSE); while (TRUE) { - now = nm_utils_get_monotonic_timestamp_ms (); + now = nm_utils_get_monotonic_timestamp_msec (); plink = nm_platform_link_get_by_ifname (platform, ifname); if ( plink @@ -704,7 +704,7 @@ nmtstp_ip_address_check_lifetime (const NMPlatformIPAddress *addr, g_assert (addr); if (now == -1) - now = nm_utils_get_monotonic_timestamp_s (); + now = nm_utils_get_monotonic_timestamp_sec (); g_assert (now > 0); g_assert (expected_preferred <= expected_lifetime); @@ -750,7 +750,7 @@ nmtstp_ip_address_assert_lifetime (const NMPlatformIPAddress *addr, g_assert (addr); if (now == -1) - now = nm_utils_get_monotonic_timestamp_s (); + now = nm_utils_get_monotonic_timestamp_sec (); g_assert (now > 0); g_assert (expected_preferred <= expected_lifetime); @@ -886,7 +886,7 @@ _ip_address_add (NMPlatform *platform, } /* Let's wait until we see the address. */ - end_time = nm_utils_get_monotonic_timestamp_ms () + 500; + end_time = nm_utils_get_monotonic_timestamp_msec () + 500; do { if (external_command) @@ -1091,7 +1091,7 @@ _ip_address_del (NMPlatform *platform, } /* Let's wait until we get the result */ - end_time = nm_utils_get_monotonic_timestamp_ms () + 250; + end_time = nm_utils_get_monotonic_timestamp_msec () + 250; do { if (external_command) nm_platform_process_events (platform); @@ -1736,7 +1736,7 @@ nmtstp_link_delete (NMPlatform *platform, } /* Let's wait until we get the result */ - end_time = nm_utils_get_monotonic_timestamp_ms () + 250; + end_time = nm_utils_get_monotonic_timestamp_msec () + 250; do { if (external_command) nm_platform_process_events (platform); @@ -1785,7 +1785,7 @@ nmtstp_link_set_updown (NMPlatform *platform, } /* Let's wait until we get the result */ - end_time = nm_utils_get_monotonic_timestamp_ms () + 250; + end_time = nm_utils_get_monotonic_timestamp_msec () + 250; do { if (external_command) nm_platform_process_events (platform); diff --git a/src/platform/tests/test-common.h b/src/platform/tests/test-common.h index c571df6a06..6f5a6cf62b 100644 --- a/src/platform/tests/test-common.h +++ b/src/platform/tests/test-common.h @@ -32,13 +32,13 @@ const NMLogDomain __domain = (domain); \ \ if (nm_logging_enabled (__level, __domain)) { \ - gint64 _ts = nm_utils_get_monotonic_timestamp_ns (); \ + gint64 _ts = nm_utils_get_monotonic_timestamp_nsec (); \ \ _nm_log (__level, __domain, 0, NULL, NULL, \ "%s[%ld.%09ld]: " _NM_UTILS_MACRO_FIRST (__VA_ARGS__), \ _NMLOG_PREFIX_NAME, \ - (long) (_ts / NM_UTILS_NS_PER_SECOND), \ - (long) (_ts % NM_UTILS_NS_PER_SECOND) \ + (long) (_ts / NM_UTILS_NSEC_PER_SEC), \ + (long) (_ts % NM_UTILS_NSEC_PER_SEC) \ _NM_UTILS_MACRO_REST (__VA_ARGS__)); \ } \ } G_STMT_END @@ -101,14 +101,14 @@ int nmtstp_run_command (const char *format, ...) _nm_printf (1, 2); /*****************************************************************************/ -guint nmtstp_wait_for_signal (NMPlatform *platform, gint64 timeout_ms); +guint nmtstp_wait_for_signal (NMPlatform *platform, gint64 timeout_msec); guint nmtstp_wait_for_signal_until (NMPlatform *platform, gint64 until_ms); -const NMPlatformLink *nmtstp_wait_for_link (NMPlatform *platform, const char *ifname, NMLinkType expected_link_type, gint64 timeout_ms); +const NMPlatformLink *nmtstp_wait_for_link (NMPlatform *platform, const char *ifname, NMLinkType expected_link_type, gint64 timeout_msec); const NMPlatformLink *nmtstp_wait_for_link_until (NMPlatform *platform, const char *ifname, NMLinkType expected_link_type, gint64 until_ms); -#define nmtstp_assert_wait_for_signal(platform, timeout_ms) \ +#define nmtstp_assert_wait_for_signal(platform, timeout_msec) \ G_STMT_START { \ - if (nmtstp_wait_for_signal (platform, timeout_ms) == 0) \ + if (nmtstp_wait_for_signal (platform, timeout_msec) == 0) \ g_assert_not_reached (); \ } G_STMT_END @@ -118,8 +118,8 @@ const NMPlatformLink *nmtstp_wait_for_link_until (NMPlatform *platform, const ch g_assert_not_reached (); \ } G_STMT_END -#define nmtstp_assert_wait_for_link(platform, ifname, expected_link_type, timeout_ms) \ - nmtst_assert_nonnull (nmtstp_wait_for_link (platform, ifname, expected_link_type, timeout_ms)) +#define nmtstp_assert_wait_for_link(platform, ifname, expected_link_type, timeout_msec) \ + nmtst_assert_nonnull (nmtstp_wait_for_link (platform, ifname, expected_link_type, timeout_msec)) #define nmtstp_assert_wait_for_link_until(platform, ifname, expected_link_type, until_ms) \ nmtst_assert_nonnull (nmtstp_wait_for_link_until (platform, ifname, expected_link_type, until_ms)) diff --git a/src/platform/tests/test-link.c b/src/platform/tests/test-link.c index 37e1cde516..0e166a5f7f 100644 --- a/src/platform/tests/test-link.c +++ b/src/platform/tests/test-link.c @@ -2095,7 +2095,7 @@ test_vlan_set_xgress (void) static void test_create_many_links_do (guint n_devices) { - gint64 time, start_time = nm_utils_get_monotonic_timestamp_ns (); + gint64 time, start_time = nm_utils_get_monotonic_timestamp_nsec (); guint i; char name[64]; const NMPlatformLink *pllink; @@ -2149,8 +2149,8 @@ test_create_many_links_do (guint n_devices) _LOGI (">>> process events after deleting devices..."); nm_platform_process_events (NM_PLATFORM_GET); - time = nm_utils_get_monotonic_timestamp_ns () - start_time; - _LOGI (">>> finished in %ld.%09ld seconds", (long) (time / NM_UTILS_NS_PER_SECOND), (long) (time % NM_UTILS_NS_PER_SECOND)); + time = nm_utils_get_monotonic_timestamp_nsec () - start_time; + _LOGI (">>> finished in %ld.%09ld seconds", (long) (time / NM_UTILS_NSEC_PER_SEC), (long) (time % NM_UTILS_NSEC_PER_SEC)); } static void diff --git a/src/platform/tests/test-route.c b/src/platform/tests/test-route.c index f8b1bb9abf..e2c1ed80e4 100644 --- a/src/platform/tests/test-route.c +++ b/src/platform/tests/test-route.c @@ -19,7 +19,7 @@ static void _wait_for_ipv4_addr_device_route (NMPlatform *platform, - gint64 timeout_ms, + gint64 timeout_msec, int ifindex, in_addr_t addr, guint8 plen) @@ -55,7 +55,7 @@ _wait_for_ipv4_addr_device_route (NMPlatform *platform, static void _wait_for_ipv6_addr_non_tentative (NMPlatform *platform, - gint64 timeout_ms, + gint64 timeout_msec, int ifindex, guint addr_n, const struct in6_addr *addrs) @@ -67,7 +67,7 @@ _wait_for_ipv6_addr_non_tentative (NMPlatform *platform, * small amount of time, which prevents the immediate addition of the route * with RTA_PREFSRC */ - NMTST_WAIT_ASSERT (timeout_ms, { + NMTST_WAIT_ASSERT (timeout_msec, { gboolean should_wait = FALSE; const NMPlatformIP6Address *plt_addr; diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index ccbab807ab..555d1e1a6f 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -2365,7 +2365,7 @@ _autoconnect_retries_set (NMSettingsConnection *self, * the tracking of resetting the retry count in NMPolicy needs adjustment * in _connection_autoconnect_retries_set() (as it would need to re-evaluate * the next-timeout every time a connection gets blocked). */ - priv->autoconnect_retries_blocked_until = nm_utils_get_monotonic_timestamp_s () + AUTOCONNECT_RESET_RETRIES_TIMER; + priv->autoconnect_retries_blocked_until = nm_utils_get_monotonic_timestamp_sec () + AUTOCONNECT_RESET_RETRIES_TIMER; } } diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index f964fb16e4..bbf4595463 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -548,7 +548,7 @@ _startup_complete_check (NMSettings *self, goto ready; if (!now_us) - now_us = nm_utils_get_monotonic_timestamp_us (); + now_us = nm_utils_get_monotonic_timestamp_usec (); next_expiry = 0; @@ -654,7 +654,7 @@ _startup_complete_notify_connection (NMSettings *self, } else scd = g_hash_table_lookup (priv->startup_complete_idx, &sett_conn); if (!scd) { - now_us = nm_utils_get_monotonic_timestamp_us (); + now_us = nm_utils_get_monotonic_timestamp_usec (); scd = g_slice_new (StartupCompleteData); *scd = (StartupCompleteData) { .sett_conn = g_object_ref (sett_conn), diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c index 6ef2931129..794955b3d9 100644 --- a/src/supplicant/nm-supplicant-interface.c +++ b/src/supplicant/nm-supplicant-interface.c @@ -160,7 +160,7 @@ typedef struct { GHashTable * peer_proxies; - gint64 last_scan; /* timestamp as returned by nm_utils_get_monotonic_timestamp_ms() */ + gint64 last_scan; /* timestamp as returned by nm_utils_get_monotonic_timestamp_msec() */ NMSupplicantAuthState auth_state; } NMSupplicantInterfacePrivate; @@ -241,7 +241,7 @@ bss_proxy_properties_changed_cb (GDBusProxy *proxy, NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self); if (priv->scanning) - priv->last_scan = nm_utils_get_monotonic_timestamp_ms (); + priv->last_scan = nm_utils_get_monotonic_timestamp_msec (); g_signal_emit (self, signals[BSS_UPDATED], 0, g_dbus_proxy_get_object_path (proxy), @@ -492,7 +492,7 @@ set_state (NMSupplicantInterface *self, NMSupplicantInterfaceState new_state) if ( priv->state == NM_SUPPLICANT_INTERFACE_STATE_SCANNING || old_state == NM_SUPPLICANT_INTERFACE_STATE_SCANNING) - priv->last_scan = nm_utils_get_monotonic_timestamp_ms (); + priv->last_scan = nm_utils_get_monotonic_timestamp_msec (); /* Disconnect reason is no longer relevant when not in the DISCONNECTED state */ if (priv->state != NM_SUPPLICANT_INTERFACE_STATE_DISCONNECTED) @@ -554,7 +554,7 @@ set_scanning (NMSupplicantInterface *self, gboolean new_scanning) /* Cache time of last scan completion */ if (priv->scanning == FALSE) - priv->last_scan = nm_utils_get_monotonic_timestamp_ms (); + priv->last_scan = nm_utils_get_monotonic_timestamp_msec (); _notify (self, PROP_SCANNING); } @@ -1286,7 +1286,7 @@ wpas_iface_scan_done (GDBusProxy *proxy, NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self); /* Cache last scan completed time */ - priv->last_scan = nm_utils_get_monotonic_timestamp_ms (); + priv->last_scan = nm_utils_get_monotonic_timestamp_msec (); priv->scan_done_success |= success; scan_done_emit_signal (self); } @@ -1301,7 +1301,7 @@ wpas_iface_bss_added (GDBusProxy *proxy, NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self); if (priv->scanning) - priv->last_scan = nm_utils_get_monotonic_timestamp_ms (); + priv->last_scan = nm_utils_get_monotonic_timestamp_msec (); bss_add_new (self, path); } diff --git a/src/tests/test-core-with-expect.c b/src/tests/test-core-with-expect.c index 74e1043b33..555b962473 100644 --- a/src/tests/test-core-with-expect.c +++ b/src/tests/test-core-with-expect.c @@ -20,7 +20,7 @@ static void test_nm_utils_monotonic_timestamp_as_boottime (void) { - gint64 timestamp_ns_per_tick, now, now_boottime, now_boottime_2, now_boottime_3; + gint64 timestamp_nsec_per_tick, now, now_boottime, now_boottime_2, now_boottime_3; struct timespec tp; clockid_t clockid; guint i; @@ -35,22 +35,22 @@ test_nm_utils_monotonic_timestamp_as_boottime (void) if (clock_gettime (clockid, &tp) != 0) g_assert_not_reached (); - now_boottime = ( ((gint64) tp.tv_sec) * NM_UTILS_NS_PER_SECOND ) + ((gint64) tp.tv_nsec); + now_boottime = ( ((gint64) tp.tv_sec) * NM_UTILS_NSEC_PER_SEC ) + ((gint64) tp.tv_nsec); - now = nm_utils_get_monotonic_timestamp_ns (); + now = nm_utils_get_monotonic_timestamp_nsec (); now_boottime_2 = nm_utils_monotonic_timestamp_as_boottime (now, 1); g_assert_cmpint (now_boottime_2, >=, 0); g_assert_cmpint (now_boottime_2, >=, now_boottime); - g_assert_cmpint (now_boottime_2 - now_boottime, <=, NM_UTILS_NS_PER_SECOND / 10); + g_assert_cmpint (now_boottime_2 - now_boottime, <=, NM_UTILS_NSEC_PER_SEC / 10); g_assert_cmpint (now, ==, nm_utils_monotonic_timestamp_from_boottime (now_boottime_2, 1)); - for (timestamp_ns_per_tick = 1; timestamp_ns_per_tick <= NM_UTILS_NS_PER_SECOND; timestamp_ns_per_tick *= 10) { - now_boottime_3 = nm_utils_monotonic_timestamp_as_boottime (now / timestamp_ns_per_tick, timestamp_ns_per_tick); + for (timestamp_nsec_per_tick = 1; timestamp_nsec_per_tick <= NM_UTILS_NSEC_PER_SEC; timestamp_nsec_per_tick *= 10) { + now_boottime_3 = nm_utils_monotonic_timestamp_as_boottime (now / timestamp_nsec_per_tick, timestamp_nsec_per_tick); - g_assert_cmpint (now_boottime_2 / timestamp_ns_per_tick, ==, now_boottime_3); - g_assert_cmpint (now / timestamp_ns_per_tick, ==, nm_utils_monotonic_timestamp_from_boottime (now_boottime_3, timestamp_ns_per_tick)); + g_assert_cmpint (now_boottime_2 / timestamp_nsec_per_tick, ==, now_boottime_3); + g_assert_cmpint (now / timestamp_nsec_per_tick, ==, nm_utils_monotonic_timestamp_from_boottime (now_boottime_3, timestamp_nsec_per_tick)); } } } diff --git a/src/tests/test-systemd.c b/src/tests/test-systemd.c index faed0e567b..6425c29488 100644 --- a/src/tests/test-systemd.c +++ b/src/tests/test-systemd.c @@ -27,7 +27,7 @@ _nm_utils_set_testing (NMUtilsTestFlags flags) } gint32 -nm_utils_get_monotonic_timestamp_s (void) +nm_utils_get_monotonic_timestamp_sec (void) { return 1; } From 0738c1044524b938f008c111b829db7dabbb8269 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Wed, 11 Dec 2019 11:54:08 +0100 Subject: [PATCH 094/109] ovs: check state before starting ip configuration after link change When the link becomes available, check that the device is in the ip-config state before starting ip configuration. Also, reset the 'waiting_for_interface' flag when the device deactivates. https://bugzilla.redhat.com/show_bug.cgi?id=1781165 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/358 --- src/devices/ovs/nm-device-ovs-interface.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/devices/ovs/nm-device-ovs-interface.c b/src/devices/ovs/nm-device-ovs-interface.c index 4cbb0cd1ff..726e990131 100644 --- a/src/devices/ovs/nm-device-ovs-interface.c +++ b/src/devices/ovs/nm-device-ovs-interface.c @@ -98,7 +98,9 @@ link_changed (NMDevice *device, { NMDeviceOvsInterfacePrivate *priv = NM_DEVICE_OVS_INTERFACE_GET_PRIVATE (device); - if (pllink && priv->waiting_for_interface) { + if ( pllink + && priv->waiting_for_interface + && nm_device_get_state (device) == NM_DEVICE_STATE_IP_CONFIG) { priv->waiting_for_interface = FALSE; nm_device_bring_up (device, TRUE, NULL); nm_device_activate_schedule_stage3_ip_config_start (device); @@ -142,6 +144,15 @@ can_unmanaged_external_down (NMDevice *self) return FALSE; } +static void +deactivate (NMDevice *device) +{ + NMDeviceOvsInterface *self = NM_DEVICE_OVS_INTERFACE (device); + NMDeviceOvsInterfacePrivate *priv = NM_DEVICE_OVS_INTERFACE_GET_PRIVATE (self); + + priv->waiting_for_interface = FALSE; +} + /*****************************************************************************/ static void @@ -171,6 +182,7 @@ nm_device_ovs_interface_class_init (NMDeviceOvsInterfaceClass *klass) device_class->connection_type_check_compatible = NM_SETTING_OVS_INTERFACE_SETTING_NAME; device_class->link_types = NM_DEVICE_DEFINE_LINK_TYPES (NM_LINK_TYPE_OPENVSWITCH); + device_class->deactivate = deactivate; device_class->get_type_description = get_type_description; device_class->create_and_realize = create_and_realize; device_class->get_generic_capabilities = get_generic_capabilities; From 6d6e1402dc6e68688b05d7df3f5a05957db56e7e Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Wed, 11 Dec 2019 11:57:33 +0100 Subject: [PATCH 095/109] device: don't reapply IP configuration if the ifindex is missing Assertions will fail in ip_config_merge_and_apply() if the device doesn't have an ifindex. Reproducible with: $ nmcli connection add type ovs-bridge ifname ovs0 ipv4.method disabled ipv6.method disabled Connection 'ovs-bridge-ovs0' (1d5e794b-10ad-4b2b-aa7c-5ca7e34b0a55) successfully added $ nmcli device reapply ovs0 Error: Reapplying connection to device '(null)' (/org/freedesktop/NetworkManager/Devices/16) failed: Remote peer disconnected $ journalctl -u NetworkManager -e ... NetworkManager[73824]: nm_ip4_config_add_dependent_routes: assertion 'ifindex > 0' failed systemd[1]: NetworkManager.service: Main process exited, code=dumped, status=5/TRAP ... --- src/devices/nm-device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 381f68874d..56858f859e 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -11615,7 +11615,8 @@ nm_device_reactivate_ip4_config (NMDevice *self, } } - if (!ip_config_merge_and_apply (self, AF_INET, TRUE)) + if ( nm_device_get_ip_ifindex (self) > 0 + && !ip_config_merge_and_apply (self, AF_INET, TRUE)) _LOGW (LOGD_IP4, "Failed to reapply IPv4 configuration"); } } @@ -11688,7 +11689,8 @@ nm_device_reactivate_ip6_config (NMDevice *self, } } - if (!ip_config_merge_and_apply (self, AF_INET6, TRUE)) + if ( nm_device_get_ip_ifindex (self) > 0 + && !ip_config_merge_and_apply (self, AF_INET6, TRUE)) _LOGW (LOGD_IP4, "Failed to reapply IPv6 configuration"); } } From 6c716912eb6ddcbf56feee1913bf9235deae20c0 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Fri, 13 Dec 2019 18:05:38 +0100 Subject: [PATCH 096/109] manager: create a virtual device only if the connection can autoconnect The autoconnection for virtual devices currently works in two phases. First we detect that there is suitable profile that can autoconnect and we realize the device. Then, when the device becomes 'disconnected', autoconnect kicks in and starts the activation. However, if autoconnect is blocked for a device, currently we do step 1 without step 2, leaving a stale interface around. Fix this by also checking that autoconnect is not blocked during step 1. https://bugzilla.redhat.com/show_bug.cgi?id=1765047 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/360 --- src/nm-manager.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/nm-manager.c b/src/nm-manager.c index b1810474b0..13e01c0b7c 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -2024,7 +2024,8 @@ system_create_virtual_device (NMManager *self, NMConnection *connection) s_con = nm_connection_get_setting_connection (candidate); g_assert (s_con); - if (!nm_setting_connection_get_autoconnect (s_con)) + if ( !nm_setting_connection_get_autoconnect (s_con) + || nm_settings_connection_autoconnect_is_blocked (connections[i])) continue; /* Create any backing resources the device needs */ From a1771c738dd2e1437bd9f7c73805fd8a1b1b3d1d Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sun, 15 Dec 2019 10:33:28 +0100 Subject: [PATCH 097/109] client: fallback to CLOCK_MONOTONIC for timerfd RHEL7 supports clock_gettime(CLOCK_BOOTIME), but it does not support timerfd_create(CLOCK_BOOTIME). Creating a timerfd will fail with EINVAL. Fallback to CLOCK_MONOTONIC. Compare this to n-acd which also has compatibility code to fallback to CLOCK_MONOTONIC. However when n-acd falls back to CLOCK_MONOTONIC, it uses monotonic clock also for clock_gettime(). For n-dhcp4, the timestamps are also exposed in the public API (n_dhcp4_client_lease_get_lifetime()). Hence, for timestamps n-dhcp4 still uses and requires clock_gettime(CLOCK_BOOTIME). Only the internal timeout handling with the timerfd falls back to CLOCK_MONOTONIC. https://github.com/nettools/n-dhcp4/pull/13 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/362 --- shared/n-dhcp4/src/n-dhcp4-client.c | 30 ++++++++++++++++++++++++---- shared/n-dhcp4/src/n-dhcp4-private.h | 1 + 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/shared/n-dhcp4/src/n-dhcp4-client.c b/shared/n-dhcp4/src/n-dhcp4-client.c index 5449106a9b..0bfe48ee95 100644 --- a/shared/n-dhcp4/src/n-dhcp4-client.c +++ b/shared/n-dhcp4/src/n-dhcp4-client.c @@ -388,8 +388,14 @@ _c_public_ int n_dhcp4_client_new(NDhcp4Client **clientp, NDhcp4ClientConfig *co return -errno; client->fd_timer = timerfd_create(CLOCK_BOOTTIME, TFD_CLOEXEC | TFD_NONBLOCK); - if (client->fd_timer < 0) - return -errno; + if (client->fd_timer < 0) { + if (errno != EINVAL) + return -errno; + client->fd_timer = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC | TFD_NONBLOCK); + if (client->fd_timer < 0) + return -errno; + client->timerfd_is_monotonic = true; + } ev.data.u32 = N_DHCP4_CLIENT_EPOLL_TIMER; r = epoll_ctl(client->fd_epoll, EPOLL_CTL_ADD, client->fd_timer, &ev); @@ -499,8 +505,24 @@ void n_dhcp4_client_arm_timer(NDhcp4Client *client) { n_dhcp4_client_probe_get_timeout(client->current_probe, &timeout); if (timeout != client->scheduled_timeout) { + uint64_t scheduled_timeout = timeout; + int flags = TFD_TIMER_ABSTIME; + + if ( timeout != 0 + && client->timerfd_is_monotonic) { + uint64_t now; + + /* the timerfd ticks with CLOCK_MONOTONIC. Calculate and set the relative + * timeout. */ + now = n_dhcp4_gettime(CLOCK_BOOTTIME); + if (timeout <= now) + timeout = 1; + else + timeout = timeout - now; + flags = 0; + } r = timerfd_settime(client->fd_timer, - TFD_TIMER_ABSTIME, + flags, &(struct itimerspec){ .it_value = { .tv_sec = timeout / UINT64_C(1000000000), @@ -510,7 +532,7 @@ void n_dhcp4_client_arm_timer(NDhcp4Client *client) { NULL); c_assert(r >= 0); - client->scheduled_timeout = timeout; + client->scheduled_timeout = scheduled_timeout; } } diff --git a/shared/n-dhcp4/src/n-dhcp4-private.h b/shared/n-dhcp4/src/n-dhcp4-private.h index fa2fda38de..1cf5f25e55 100644 --- a/shared/n-dhcp4/src/n-dhcp4-private.h +++ b/shared/n-dhcp4/src/n-dhcp4-private.h @@ -332,6 +332,7 @@ struct NDhcp4Client { uint64_t scheduled_timeout; bool preempted : 1; + bool timerfd_is_monotonic : 1; }; #define N_DHCP4_CLIENT_NULL(_x) { \ From 0d155d1821875ab0de1ebe95570e5684daeb7d52 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 13 Dec 2019 13:01:02 +0100 Subject: [PATCH 098/109] systemd: update code from upstream (2019-12-13) This is a direct dump from systemd git. ====== SYSTEMD_DIR=../systemd COMMIT=c8bf87b3399a3dd0b17fd0003b9797635b161ee0 ( cd "$SYSTEMD_DIR" git checkout "$COMMIT" git reset --hard git clean -fdx ) git ls-files -z :/src/systemd/src/ \ :/shared/systemd/src/ \ :/shared/nm-std-aux/unaligned.h | \ xargs -0 rm -f nm_copy_sd_shared() { mkdir -p "./shared/systemd/$(dirname "$1")" cp "$SYSTEMD_DIR/$1" "./shared/systemd/$1" } nm_copy_sd_core() { mkdir -p "./src/systemd/$(dirname "$1")" cp "$SYSTEMD_DIR/$1" "./src/systemd/$1" } nm_copy_sd_stdaux() { mkdir -p "./shared/nm-std-aux/" cp "$SYSTEMD_DIR/$1" "./shared/nm-std-aux/${1##*/}" } nm_copy_sd_core "src/libsystemd-network/arp-util.c" nm_copy_sd_core "src/libsystemd-network/arp-util.h" nm_copy_sd_core "src/libsystemd-network/dhcp-identifier.c" nm_copy_sd_core "src/libsystemd-network/dhcp-identifier.h" nm_copy_sd_core "src/libsystemd-network/dhcp-internal.h" nm_copy_sd_core "src/libsystemd-network/dhcp-lease-internal.h" nm_copy_sd_core "src/libsystemd-network/dhcp-network.c" nm_copy_sd_core "src/libsystemd-network/dhcp-option.c" nm_copy_sd_core "src/libsystemd-network/dhcp-packet.c" nm_copy_sd_core "src/libsystemd-network/dhcp-protocol.h" nm_copy_sd_core "src/libsystemd-network/dhcp6-internal.h" nm_copy_sd_core "src/libsystemd-network/dhcp6-lease-internal.h" nm_copy_sd_core "src/libsystemd-network/dhcp6-network.c" nm_copy_sd_core "src/libsystemd-network/dhcp6-option.c" nm_copy_sd_core "src/libsystemd-network/dhcp6-protocol.h" nm_copy_sd_core "src/libsystemd-network/lldp-internal.h" nm_copy_sd_core "src/libsystemd-network/lldp-neighbor.c" nm_copy_sd_core "src/libsystemd-network/lldp-neighbor.h" nm_copy_sd_core "src/libsystemd-network/lldp-network.c" nm_copy_sd_core "src/libsystemd-network/lldp-network.h" nm_copy_sd_core "src/libsystemd-network/network-internal.c" nm_copy_sd_core "src/libsystemd-network/network-internal.h" nm_copy_sd_core "src/libsystemd-network/sd-dhcp-client.c" nm_copy_sd_core "src/libsystemd-network/sd-dhcp-lease.c" nm_copy_sd_core "src/libsystemd-network/sd-dhcp6-client.c" nm_copy_sd_core "src/libsystemd-network/sd-dhcp6-lease.c" nm_copy_sd_core "src/libsystemd-network/sd-ipv4acd.c" nm_copy_sd_core "src/libsystemd-network/sd-ipv4ll.c" nm_copy_sd_core "src/libsystemd-network/sd-lldp.c" nm_copy_sd_core "src/libsystemd/sd-event/event-source.h" nm_copy_sd_core "src/libsystemd/sd-event/event-util.c" nm_copy_sd_core "src/libsystemd/sd-event/event-util.h" nm_copy_sd_core "src/libsystemd/sd-event/sd-event.c" nm_copy_sd_core "src/libsystemd/sd-id128/id128-util.c" nm_copy_sd_core "src/libsystemd/sd-id128/id128-util.h" nm_copy_sd_core "src/libsystemd/sd-id128/sd-id128.c" nm_copy_sd_core "src/systemd/_sd-common.h" nm_copy_sd_core "src/systemd/sd-dhcp-client.h" nm_copy_sd_core "src/systemd/sd-dhcp-lease.h" nm_copy_sd_core "src/systemd/sd-dhcp-option.h" nm_copy_sd_core "src/systemd/sd-dhcp6-client.h" nm_copy_sd_core "src/systemd/sd-dhcp6-lease.h" nm_copy_sd_core "src/systemd/sd-event.h" nm_copy_sd_core "src/systemd/sd-id128.h" nm_copy_sd_core "src/systemd/sd-ipv4acd.h" nm_copy_sd_core "src/systemd/sd-ipv4ll.h" nm_copy_sd_core "src/systemd/sd-lldp.h" nm_copy_sd_core "src/systemd/sd-ndisc.h" nm_copy_sd_shared "src/basic/alloc-util.c" nm_copy_sd_shared "src/basic/alloc-util.h" nm_copy_sd_shared "src/basic/async.h" nm_copy_sd_shared "src/basic/env-file.c" nm_copy_sd_shared "src/basic/env-file.h" nm_copy_sd_shared "src/basic/env-util.c" nm_copy_sd_shared "src/basic/env-util.h" nm_copy_sd_shared "src/basic/errno-util.h" nm_copy_sd_shared "src/basic/escape.c" nm_copy_sd_shared "src/basic/escape.h" nm_copy_sd_shared "src/basic/ether-addr-util.c" nm_copy_sd_shared "src/basic/ether-addr-util.h" nm_copy_sd_shared "src/basic/extract-word.c" nm_copy_sd_shared "src/basic/extract-word.h" nm_copy_sd_shared "src/basic/fd-util.c" nm_copy_sd_shared "src/basic/fd-util.h" nm_copy_sd_shared "src/basic/fileio.c" nm_copy_sd_shared "src/basic/fileio.h" nm_copy_sd_shared "src/basic/format-util.c" nm_copy_sd_shared "src/basic/format-util.h" nm_copy_sd_shared "src/basic/fs-util.c" nm_copy_sd_shared "src/basic/fs-util.h" nm_copy_sd_shared "src/basic/hash-funcs.c" nm_copy_sd_shared "src/basic/hash-funcs.h" nm_copy_sd_shared "src/basic/hashmap.c" nm_copy_sd_shared "src/basic/hashmap.h" nm_copy_sd_shared "src/basic/hexdecoct.c" nm_copy_sd_shared "src/basic/hexdecoct.h" nm_copy_sd_shared "src/basic/hostname-util.c" nm_copy_sd_shared "src/basic/hostname-util.h" nm_copy_sd_shared "src/basic/in-addr-util.c" nm_copy_sd_shared "src/basic/in-addr-util.h" nm_copy_sd_shared "src/basic/io-util.c" nm_copy_sd_shared "src/basic/io-util.h" nm_copy_sd_shared "src/basic/list.h" nm_copy_sd_shared "src/basic/log.h" nm_copy_sd_shared "src/basic/macro.h" nm_copy_sd_shared "src/basic/memory-util.c" nm_copy_sd_shared "src/basic/memory-util.h" nm_copy_sd_shared "src/basic/mempool.c" nm_copy_sd_shared "src/basic/mempool.h" nm_copy_sd_shared "src/basic/missing_fcntl.h" nm_copy_sd_shared "src/basic/missing_random.h" nm_copy_sd_shared "src/basic/missing_socket.h" nm_copy_sd_shared "src/basic/missing_stat.h" nm_copy_sd_shared "src/basic/missing_syscall.h" nm_copy_sd_shared "src/basic/missing_type.h" nm_copy_sd_shared "src/basic/parse-util.c" nm_copy_sd_shared "src/basic/parse-util.h" nm_copy_sd_shared "src/basic/path-util.c" nm_copy_sd_shared "src/basic/path-util.h" nm_copy_sd_shared "src/basic/prioq.c" nm_copy_sd_shared "src/basic/prioq.h" nm_copy_sd_shared "src/basic/process-util.c" nm_copy_sd_shared "src/basic/process-util.h" nm_copy_sd_shared "src/basic/random-util.c" nm_copy_sd_shared "src/basic/random-util.h" nm_copy_sd_shared "src/basic/set.h" nm_copy_sd_shared "src/basic/signal-util.c" nm_copy_sd_shared "src/basic/signal-util.h" nm_copy_sd_shared "src/basic/siphash24.h" nm_copy_sd_shared "src/basic/socket-util.c" nm_copy_sd_shared "src/basic/socket-util.h" nm_copy_sd_shared "src/basic/sort-util.h" nm_copy_sd_shared "src/basic/sparse-endian.h" nm_copy_sd_shared "src/basic/stat-util.c" nm_copy_sd_shared "src/basic/stat-util.h" nm_copy_sd_shared "src/basic/stdio-util.h" nm_copy_sd_shared "src/basic/string-table.c" nm_copy_sd_shared "src/basic/string-table.h" nm_copy_sd_shared "src/basic/string-util.c" nm_copy_sd_shared "src/basic/string-util.h" nm_copy_sd_shared "src/basic/strv.c" nm_copy_sd_shared "src/basic/strv.h" nm_copy_sd_shared "src/basic/strxcpyx.c" nm_copy_sd_shared "src/basic/strxcpyx.h" nm_copy_sd_shared "src/basic/time-util.c" nm_copy_sd_shared "src/basic/time-util.h" nm_copy_sd_shared "src/basic/tmpfile-util.c" nm_copy_sd_shared "src/basic/tmpfile-util.h" nm_copy_sd_shared "src/basic/umask-util.h" nm_copy_sd_shared "src/basic/utf8.c" nm_copy_sd_shared "src/basic/utf8.h" nm_copy_sd_shared "src/basic/util.c" nm_copy_sd_shared "src/basic/util.h" nm_copy_sd_shared "src/shared/dns-domain.c" nm_copy_sd_shared "src/shared/dns-domain.h" nm_copy_sd_stdaux "src/basic/unaligned.h" --- shared/systemd/src/basic/errno-util.h | 8 + shared/systemd/src/basic/macro.h | 28 + shared/systemd/src/basic/memory-util.h | 21 +- shared/systemd/src/basic/missing_syscall.h | 570 ++++++++++++++++++ shared/systemd/src/basic/parse-util.c | 34 +- shared/systemd/src/basic/process-util.c | 39 ++ shared/systemd/src/basic/process-util.h | 23 +- shared/systemd/src/basic/signal-util.c | 304 ++++++++++ shared/systemd/src/basic/signal-util.h | 2 + shared/systemd/src/basic/string-util.c | 10 + shared/systemd/src/basic/string-util.h | 2 + shared/systemd/src/basic/strv.c | 28 +- shared/systemd/src/basic/tmpfile-util.c | 50 +- .../src/libsystemd-network/sd-ipv4acd.c | 6 +- .../src/libsystemd-network/sd-ipv4ll.c | 2 +- .../src/libsystemd/sd-event/event-source.h | 8 +- .../src/libsystemd/sd-event/sd-event.c | 462 +++++++++++++- .../src/libsystemd/sd-id128/id128-util.c | 2 +- .../src/libsystemd/sd-id128/id128-util.h | 4 +- src/systemd/src/systemd/sd-event.h | 12 + src/systemd/src/systemd/sd-ipv4acd.h | 3 +- 21 files changed, 1515 insertions(+), 103 deletions(-) create mode 100644 shared/systemd/src/basic/missing_syscall.h create mode 100644 shared/systemd/src/basic/signal-util.c diff --git a/shared/systemd/src/basic/errno-util.h b/shared/systemd/src/basic/errno-util.h index 8f1be6c00e..65a6384eeb 100644 --- a/shared/systemd/src/basic/errno-util.h +++ b/shared/systemd/src/basic/errno-util.h @@ -101,3 +101,11 @@ static inline bool ERRNO_IS_PRIVILEGE(int r) { EACCES, EPERM); } + +/* Three difference errors for "not enough disk space" */ +static inline bool ERRNO_IS_DISK_SPACE(int r) { + return IN_SET(abs(r), + ENOSPC, + EDQUOT, + EFBIG); +} diff --git a/shared/systemd/src/basic/macro.h b/shared/systemd/src/basic/macro.h index 18e5085669..5aa7f59c0b 100644 --- a/shared/systemd/src/basic/macro.h +++ b/shared/systemd/src/basic/macro.h @@ -163,6 +163,11 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) { /* align to next higher power-of-2 (except for: 0 => 0, overflow => 0) */ static inline unsigned long ALIGN_POWER2(unsigned long u) { + + /* Avoid subtraction overflow */ + if (u == 0) + return 0; + /* clz(0) is undefined */ if (u == 1) return 1; @@ -174,6 +179,29 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) { return 1UL << (sizeof(u) * 8 - __builtin_clzl(u - 1UL)); } +static inline size_t GREEDY_ALLOC_ROUND_UP(size_t l) { + size_t m; + + /* Round up allocation sizes a bit to some reasonable, likely larger value. This is supposed to be + * used for cases which are likely called in an allocation loop of some form, i.e. that repetitively + * grow stuff, for example strv_extend() and suchlike. + * + * Note the difference to GREEDY_REALLOC() here, as this helper operates on a single size value only, + * and rounds up to next multiple of 2, needing no further counter. + * + * Note the benefits of direct ALIGN_POWER2() usage: type-safety for size_t, sane handling for very + * small (i.e. <= 2) and safe handling for very large (i.e. > SSIZE_MAX) values. */ + + if (l <= 2) + return 2; /* Never allocate less than 2 of something. */ + + m = ALIGN_POWER2(l); + if (m == 0) /* overflow? */ + return l; + + return m; +} + #ifndef __COVERITY__ # define VOID_0 ((void)0) #else diff --git a/shared/systemd/src/basic/memory-util.h b/shared/systemd/src/basic/memory-util.h index 46a6907a0c..4f92a6434a 100644 --- a/shared/systemd/src/basic/memory-util.h +++ b/shared/systemd/src/basic/memory-util.h @@ -80,14 +80,21 @@ static inline void* explicit_bzero_safe(void *p, size_t l) { void *explicit_bzero_safe(void *p, size_t l); #endif -static inline void erase_and_freep(void *p) { - void *ptr = *(void**) p; +static inline void* erase_and_free(void *p) { + size_t l; - if (ptr) { - size_t l = malloc_usable_size(ptr); - explicit_bzero_safe(ptr, l); - free(ptr); - } + if (!p) + return NULL; + + l = malloc_usable_size(p); + explicit_bzero_safe(p, l); + free(p); + + return NULL; +} + +static inline void erase_and_freep(void *p) { + erase_and_free(*(void**) p); } /* Use with _cleanup_ to erase a single 'char' when leaving scope */ diff --git a/shared/systemd/src/basic/missing_syscall.h b/shared/systemd/src/basic/missing_syscall.h new file mode 100644 index 0000000000..41164ea7d0 --- /dev/null +++ b/shared/systemd/src/basic/missing_syscall.h @@ -0,0 +1,570 @@ +/* SPDX-License-Identifier: LGPL-2.1+ */ +#pragma once + +/* Missing glibc definitions to access certain kernel APIs */ + +#include +#include +#include +#include +#include +#include +#include + +#ifdef ARCH_MIPS +#include +#endif + +#include "missing_keyctl.h" +#include "missing_stat.h" + +/* linux/kcmp.h */ +#ifndef KCMP_FILE /* 3f4994cfc15f38a3159c6e3a4b3ab2e1481a6b02 (3.19) */ +#define KCMP_FILE 0 +#endif + +#if !HAVE_PIVOT_ROOT +static inline int missing_pivot_root(const char *new_root, const char *put_old) { + return syscall(__NR_pivot_root, new_root, put_old); +} + +# define pivot_root missing_pivot_root +#endif + +/* ======================================================================= */ + +#if !HAVE_MEMFD_CREATE +/* may be (invalid) negative number due to libseccomp, see PR 13319 */ +# if ! (defined __NR_memfd_create && __NR_memfd_create >= 0) +# if defined __NR_memfd_create +# undef __NR_memfd_create +# endif +# if defined __x86_64__ +# define __NR_memfd_create 319 +# elif defined __arm__ +# define __NR_memfd_create 385 +# elif defined __aarch64__ +# define __NR_memfd_create 279 +# elif defined __s390__ +# define __NR_memfd_create 350 +# elif defined _MIPS_SIM +# if _MIPS_SIM == _MIPS_SIM_ABI32 +# define __NR_memfd_create 4354 +# endif +# if _MIPS_SIM == _MIPS_SIM_NABI32 +# define __NR_memfd_create 6318 +# endif +# if _MIPS_SIM == _MIPS_SIM_ABI64 +# define __NR_memfd_create 5314 +# endif +# elif defined __i386__ +# define __NR_memfd_create 356 +# elif defined __arc__ +# define __NR_memfd_create 279 +# else +# warning "__NR_memfd_create unknown for your architecture" +# endif +# endif + +static inline int missing_memfd_create(const char *name, unsigned int flags) { +# ifdef __NR_memfd_create + return syscall(__NR_memfd_create, name, flags); +# else + errno = ENOSYS; + return -1; +# endif +} + +# define memfd_create missing_memfd_create +#endif + +/* ======================================================================= */ + +#if !HAVE_GETRANDOM +/* may be (invalid) negative number due to libseccomp, see PR 13319 */ +# if ! (defined __NR_getrandom && __NR_getrandom >= 0) +# if defined __NR_getrandom +# undef __NR_getrandom +# endif +# if defined __x86_64__ +# define __NR_getrandom 318 +# elif defined(__i386__) +# define __NR_getrandom 355 +# elif defined(__arm__) +# define __NR_getrandom 384 +# elif defined(__aarch64__) +# define __NR_getrandom 278 +# elif defined(__ia64__) +# define __NR_getrandom 1339 +# elif defined(__m68k__) +# define __NR_getrandom 352 +# elif defined(__s390x__) +# define __NR_getrandom 349 +# elif defined(__powerpc__) +# define __NR_getrandom 359 +# elif defined _MIPS_SIM +# if _MIPS_SIM == _MIPS_SIM_ABI32 +# define __NR_getrandom 4353 +# endif +# if _MIPS_SIM == _MIPS_SIM_NABI32 +# define __NR_getrandom 6317 +# endif +# if _MIPS_SIM == _MIPS_SIM_ABI64 +# define __NR_getrandom 5313 +# endif +# elif defined(__arc__) +# define __NR_getrandom 278 +# else +# warning "__NR_getrandom unknown for your architecture" +# endif +# endif + +static inline int missing_getrandom(void *buffer, size_t count, unsigned flags) { +# ifdef __NR_getrandom + return syscall(__NR_getrandom, buffer, count, flags); +# else + errno = ENOSYS; + return -1; +# endif +} + +# define getrandom missing_getrandom +#endif + +/* ======================================================================= */ + +#if !HAVE_GETTID +static inline pid_t missing_gettid(void) { + return (pid_t) syscall(__NR_gettid); +} + +# define gettid missing_gettid +#endif + +/* ======================================================================= */ + +#if !HAVE_NAME_TO_HANDLE_AT +/* may be (invalid) negative number due to libseccomp, see PR 13319 */ +# if ! (defined __NR_name_to_handle_at && __NR_name_to_handle_at >= 0) +# if defined __NR_name_to_handle_at +# undef __NR_name_to_handle_at +# endif +# if defined(__x86_64__) +# define __NR_name_to_handle_at 303 +# elif defined(__i386__) +# define __NR_name_to_handle_at 341 +# elif defined(__arm__) +# define __NR_name_to_handle_at 370 +# elif defined(__powerpc__) +# define __NR_name_to_handle_at 345 +# elif defined(__arc__) +# define __NR_name_to_handle_at 264 +# else +# error "__NR_name_to_handle_at is not defined" +# endif +# endif + +struct file_handle { + unsigned int handle_bytes; + int handle_type; + unsigned char f_handle[0]; +}; + +static inline int missing_name_to_handle_at(int fd, const char *name, struct file_handle *handle, int *mnt_id, int flags) { +# ifdef __NR_name_to_handle_at + return syscall(__NR_name_to_handle_at, fd, name, handle, mnt_id, flags); +# else + errno = ENOSYS; + return -1; +# endif +} + +# define name_to_handle_at missing_name_to_handle_at +#endif + +/* ======================================================================= */ + +#if !HAVE_SETNS +/* may be (invalid) negative number due to libseccomp, see PR 13319 */ +# if ! (defined __NR_setns && __NR_setns >= 0) +# if defined __NR_setns +# undef __NR_setns +# endif +# if defined(__x86_64__) +# define __NR_setns 308 +# elif defined(__i386__) +# define __NR_setns 346 +# elif defined(__arc__) +# define __NR_setns 268 +# else +# error "__NR_setns is not defined" +# endif +# endif + +static inline int missing_setns(int fd, int nstype) { +# ifdef __NR_setns + return syscall(__NR_setns, fd, nstype); +# else + errno = ENOSYS; + return -1; +# endif +} + +# define setns missing_setns +#endif + +/* ======================================================================= */ + +static inline pid_t raw_getpid(void) { +#if defined(__alpha__) + return (pid_t) syscall(__NR_getxpid); +#else + return (pid_t) syscall(__NR_getpid); +#endif +} + +/* ======================================================================= */ + +#if !HAVE_RENAMEAT2 +/* may be (invalid) negative number due to libseccomp, see PR 13319 */ +# if ! (defined __NR_renameat2 && __NR_renameat2 >= 0) +# if defined __NR_renameat2 +# undef __NR_renameat2 +# endif +# if defined __x86_64__ +# define __NR_renameat2 316 +# elif defined __arm__ +# define __NR_renameat2 382 +# elif defined __aarch64__ +# define __NR_renameat2 276 +# elif defined _MIPS_SIM +# if _MIPS_SIM == _MIPS_SIM_ABI32 +# define __NR_renameat2 4351 +# endif +# if _MIPS_SIM == _MIPS_SIM_NABI32 +# define __NR_renameat2 6315 +# endif +# if _MIPS_SIM == _MIPS_SIM_ABI64 +# define __NR_renameat2 5311 +# endif +# elif defined __i386__ +# define __NR_renameat2 353 +# elif defined __powerpc64__ +# define __NR_renameat2 357 +# elif defined __s390__ || defined __s390x__ +# define __NR_renameat2 347 +# elif defined __arc__ +# define __NR_renameat2 276 +# else +# warning "__NR_renameat2 unknown for your architecture" +# endif +# endif + +static inline int missing_renameat2(int oldfd, const char *oldname, int newfd, const char *newname, unsigned flags) { +# ifdef __NR_renameat2 + return syscall(__NR_renameat2, oldfd, oldname, newfd, newname, flags); +# else + errno = ENOSYS; + return -1; +# endif +} + +# define renameat2 missing_renameat2 +#endif + +/* ======================================================================= */ + +#if !HAVE_KCMP +static inline int missing_kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2) { +# if defined __NR_kcmp && __NR_kcmp >= 0 + return syscall(__NR_kcmp, pid1, pid2, type, idx1, idx2); +# else + errno = ENOSYS; + return -1; +# endif +} + +# define kcmp missing_kcmp +#endif + +/* ======================================================================= */ + +#if !HAVE_KEYCTL +static inline long missing_keyctl(int cmd, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5) { +# if defined __NR_keyctl && __NR_keyctl >= 0 + return syscall(__NR_keyctl, cmd, arg2, arg3, arg4, arg5); +# else + errno = ENOSYS; + return -1; +# endif + +# define keyctl missing_keyctl +} + +static inline key_serial_t missing_add_key(const char *type, const char *description, const void *payload, size_t plen, key_serial_t ringid) { +# if defined __NR_add_key && __NR_add_key >= 0 + return syscall(__NR_add_key, type, description, payload, plen, ringid); +# else + errno = ENOSYS; + return -1; +# endif + +# define add_key missing_add_key +} + +static inline key_serial_t missing_request_key(const char *type, const char *description, const char * callout_info, key_serial_t destringid) { +# if defined __NR_request_key && __NR_request_key >= 0 + return syscall(__NR_request_key, type, description, callout_info, destringid); +# else + errno = ENOSYS; + return -1; +# endif + +# define request_key missing_request_key +} +#endif + +/* ======================================================================= */ + +#if !HAVE_COPY_FILE_RANGE +/* may be (invalid) negative number due to libseccomp, see PR 13319 */ +# if ! (defined __NR_copy_file_range && __NR_copy_file_range >= 0) +# if defined __NR_copy_file_range +# undef __NR_copy_file_range +# endif +# if defined(__x86_64__) +# define __NR_copy_file_range 326 +# elif defined(__i386__) +# define __NR_copy_file_range 377 +# elif defined __s390__ +# define __NR_copy_file_range 375 +# elif defined __arm__ +# define __NR_copy_file_range 391 +# elif defined __aarch64__ +# define __NR_copy_file_range 285 +# elif defined __powerpc__ +# define __NR_copy_file_range 379 +# elif defined __arc__ +# define __NR_copy_file_range 285 +# else +# warning "__NR_copy_file_range not defined for your architecture" +# endif +# endif + +static inline ssize_t missing_copy_file_range(int fd_in, loff_t *off_in, + int fd_out, loff_t *off_out, + size_t len, + unsigned int flags) { +# ifdef __NR_copy_file_range + return syscall(__NR_copy_file_range, fd_in, off_in, fd_out, off_out, len, flags); +# else + errno = ENOSYS; + return -1; +# endif +} + +# define copy_file_range missing_copy_file_range +#endif + +/* ======================================================================= */ + +#if !HAVE_BPF +/* may be (invalid) negative number due to libseccomp, see PR 13319 */ +# if ! (defined __NR_bpf && __NR_bpf >= 0) +# if defined __NR_bpf +# undef __NR_bpf +# endif +# if defined __i386__ +# define __NR_bpf 357 +# elif defined __x86_64__ +# define __NR_bpf 321 +# elif defined __aarch64__ +# define __NR_bpf 280 +# elif defined __arm__ +# define __NR_bpf 386 +# elif defined __sparc__ +# define __NR_bpf 349 +# elif defined __s390__ +# define __NR_bpf 351 +# elif defined __tilegx__ +# define __NR_bpf 280 +# else +# warning "__NR_bpf not defined for your architecture" +# endif +# endif + +union bpf_attr; + +static inline int missing_bpf(int cmd, union bpf_attr *attr, size_t size) { +#ifdef __NR_bpf + return (int) syscall(__NR_bpf, cmd, attr, size); +#else + errno = ENOSYS; + return -1; +#endif +} + +# define bpf missing_bpf +#endif + +/* ======================================================================= */ + +#ifndef __IGNORE_pkey_mprotect +/* may be (invalid) negative number due to libseccomp, see PR 13319 */ +# if ! (defined __NR_pkey_mprotect && __NR_pkey_mprotect >= 0) +# if defined __NR_pkey_mprotect +# undef __NR_pkey_mprotect +# endif +# if defined __i386__ +# define __NR_pkey_mprotect 380 +# elif defined __x86_64__ +# define __NR_pkey_mprotect 329 +# elif defined __arm__ +# define __NR_pkey_mprotect 394 +# elif defined __aarch64__ +# define __NR_pkey_mprotect 394 +# elif defined __powerpc__ +# define __NR_pkey_mprotect 386 +# elif defined __s390__ +# define __NR_pkey_mprotect 384 +# elif defined _MIPS_SIM +# if _MIPS_SIM == _MIPS_SIM_ABI32 +# define __NR_pkey_mprotect 4363 +# endif +# if _MIPS_SIM == _MIPS_SIM_NABI32 +# define __NR_pkey_mprotect 6327 +# endif +# if _MIPS_SIM == _MIPS_SIM_ABI64 +# define __NR_pkey_mprotect 5323 +# endif +# else +# warning "__NR_pkey_mprotect not defined for your architecture" +# endif +# endif +#endif + +/* ======================================================================= */ + +#if !HAVE_STATX +/* may be (invalid) negative number due to libseccomp, see PR 13319 */ +# if ! (defined __NR_statx && __NR_statx >= 0) +# if defined __NR_statx +# undef __NR_statx +# endif +# if defined __aarch64__ || defined __arm__ +# define __NR_statx 397 +# elif defined __alpha__ +# define __NR_statx 522 +# elif defined __i386__ || defined __powerpc64__ +# define __NR_statx 383 +# elif defined __sparc__ +# define __NR_statx 360 +# elif defined __x86_64__ +# define __NR_statx 332 +# else +# warning "__NR_statx not defined for your architecture" +# endif +# endif + +struct statx; +#endif + +/* This typedef is supposed to be always defined. */ +typedef struct statx struct_statx; + +#if !HAVE_STATX +static inline ssize_t missing_statx(int dfd, const char *filename, unsigned flags, unsigned int mask, struct statx *buffer) { +# ifdef __NR_statx + return syscall(__NR_statx, dfd, filename, flags, mask, buffer); +# else + errno = ENOSYS; + return -1; +# endif +} + +# define statx missing_statx +#endif + +#if !HAVE_SET_MEMPOLICY + +enum { + MPOL_DEFAULT, + MPOL_PREFERRED, + MPOL_BIND, + MPOL_INTERLEAVE, + MPOL_LOCAL, +}; + +static inline long missing_set_mempolicy(int mode, const unsigned long *nodemask, + unsigned long maxnode) { + long i; +# if defined __NR_set_mempolicy && __NR_set_mempolicy >= 0 + i = syscall(__NR_set_mempolicy, mode, nodemask, maxnode); +# else + errno = ENOSYS; + i = -1; +# endif + return i; +} + +# define set_mempolicy missing_set_mempolicy +#endif + +#if !HAVE_GET_MEMPOLICY +static inline long missing_get_mempolicy(int *mode, unsigned long *nodemask, + unsigned long maxnode, void *addr, + unsigned long flags) { + long i; +# ifdef __NR_get_mempolicy + i = syscall(__NR_get_mempolicy, mode, nodemask, maxnode, addr, flags); +# else + errno = ENOSYS; + i = -1; +# endif + return i; +} + +#define get_mempolicy missing_get_mempolicy +#endif + +#if !HAVE_PIDFD_OPEN +/* may be (invalid) negative number due to libseccomp, see PR 13319 */ +# if ! (defined __NR_pidfd_open && __NR_pidfd_open >= 0) +# if defined __NR_pidfd_open +# undef __NR_pidfd_open +# endif +# define __NR_pidfd_open 434 +#endif +static inline int pidfd_open(pid_t pid, unsigned flags) { +#ifdef __NR_pidfd_open + return syscall(__NR_pidfd_open, pid, flags); +#else + errno = ENOSYS; + return -1; +#endif +} +#endif + +#if !HAVE_PIDFD_SEND_SIGNAL +/* may be (invalid) negative number due to libseccomp, see PR 13319 */ +# if ! (defined __NR_pidfd_send_signal && __NR_pidfd_send_signal >= 0) +# if defined __NR_pidfd_send_signal +# undef __NR_pidfd_send_signal +# endif +# define __NR_pidfd_send_signal 424 +#endif +static inline int pidfd_send_signal(int fd, int sig, siginfo_t *info, unsigned flags) { +#ifdef __NR_pidfd_open + return syscall(__NR_pidfd_send_signal, fd, sig, info, flags); +#else + errno = ENOSYS; + return -1; +#endif +} +#endif + +#if !HAVE_RT_SIGQUEUEINFO +static inline int rt_sigqueueinfo(pid_t tgid, int sig, siginfo_t *info) { + return syscall(__NR_rt_sigqueueinfo, tgid, sig, info); +} +#endif diff --git a/shared/systemd/src/basic/parse-util.c b/shared/systemd/src/basic/parse-util.c index aec6099c9c..b81db04989 100644 --- a/shared/systemd/src/basic/parse-util.c +++ b/shared/systemd/src/basic/parse-util.c @@ -365,7 +365,6 @@ int safe_atou_full(const char *s, unsigned base, unsigned *ret_u) { unsigned long l; assert(s); - assert(ret_u); assert(base <= 16); /* strtoul() is happy to parse negative values, and silently @@ -389,7 +388,9 @@ int safe_atou_full(const char *s, unsigned base, unsigned *ret_u) { if ((unsigned long) (unsigned) l != l) return -ERANGE; - *ret_u = (unsigned) l; + if (ret_u) + *ret_u = (unsigned) l; + return 0; } @@ -398,7 +399,6 @@ int safe_atoi(const char *s, int *ret_i) { long l; assert(s); - assert(ret_i); errno = 0; l = strtol(s, &x, 0); @@ -409,7 +409,9 @@ int safe_atoi(const char *s, int *ret_i) { if ((long) (int) l != l) return -ERANGE; - *ret_i = (int) l; + if (ret_i) + *ret_i = (int) l; + return 0; } @@ -418,7 +420,6 @@ int safe_atollu(const char *s, long long unsigned *ret_llu) { unsigned long long l; assert(s); - assert(ret_llu); s += strspn(s, WHITESPACE); @@ -431,7 +432,9 @@ int safe_atollu(const char *s, long long unsigned *ret_llu) { if (*s == '-') return -ERANGE; - *ret_llu = l; + if (ret_llu) + *ret_llu = l; + return 0; } @@ -440,7 +443,6 @@ int safe_atolli(const char *s, long long int *ret_lli) { long long l; assert(s); - assert(ret_lli); errno = 0; l = strtoll(s, &x, 0); @@ -449,7 +451,9 @@ int safe_atolli(const char *s, long long int *ret_lli) { if (!x || x == s || *x != 0) return -EINVAL; - *ret_lli = l; + if (ret_lli) + *ret_lli = l; + return 0; } @@ -458,7 +462,6 @@ int safe_atou8(const char *s, uint8_t *ret) { unsigned long l; assert(s); - assert(ret); s += strspn(s, WHITESPACE); @@ -473,7 +476,8 @@ int safe_atou8(const char *s, uint8_t *ret) { if ((unsigned long) (uint8_t) l != l) return -ERANGE; - *ret = (uint8_t) l; + if (ret) + *ret = (uint8_t) l; return 0; } @@ -507,7 +511,6 @@ int safe_atoi16(const char *s, int16_t *ret) { long l; assert(s); - assert(ret); errno = 0; l = strtol(s, &x, 0); @@ -518,7 +521,9 @@ int safe_atoi16(const char *s, int16_t *ret) { if ((long) (int16_t) l != l) return -ERANGE; - *ret = (int16_t) l; + if (ret) + *ret = (int16_t) l; + return 0; } @@ -528,7 +533,6 @@ int safe_atod(const char *s, double *ret_d) { double d = 0; assert(s); - assert(ret_d); loc = newlocale(LC_NUMERIC_MASK, "C", (locale_t) 0); if (loc == (locale_t) 0) @@ -541,7 +545,9 @@ int safe_atod(const char *s, double *ret_d) { if (!x || x == s || *x != 0) return -EINVAL; - *ret_d = (double) d; + if (ret_d) + *ret_d = (double) d; + return 0; } diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/process-util.c index 9b6c4c31f7..743c7b1dad 100644 --- a/shared/systemd/src/basic/process-util.c +++ b/shared/systemd/src/basic/process-util.c @@ -40,6 +40,7 @@ #include "rlimit-util.h" #include "signal-util.h" #include "stat-util.h" +#include "stdio-util.h" #include "string-table.h" #include "string-util.h" #include "terminal-util.h" @@ -1337,6 +1338,12 @@ int safe_fork_full( log_full_errno(prio, r, "Failed to connect stdin/stdout to /dev/null: %m"); _exit(EXIT_FAILURE); } + + } else if (flags & FORK_STDOUT_TO_STDERR) { + if (dup2(STDERR_FILENO, STDOUT_FILENO) < 0) { + log_full_errno(prio, errno, "Failed to connect stdout to stderr: %m"); + _exit(EXIT_FAILURE); + } } if (flags & FORK_RLIMIT_NOFILE_SAFE) { @@ -1488,6 +1495,38 @@ int set_oom_score_adjust(int value) { WRITE_STRING_FILE_VERIFY_ON_FAILURE|WRITE_STRING_FILE_DISABLE_BUFFER); } +int pidfd_get_pid(int fd, pid_t *ret) { + char path[STRLEN("/proc/self/fdinfo/") + DECIMAL_STR_MAX(int)]; + _cleanup_free_ char *fdinfo = NULL; + char *p; + int r; + + if (fd < 0) + return -EBADF; + + xsprintf(path, "/proc/self/fdinfo/%i", fd); + + r = read_full_file(path, &fdinfo, NULL); + if (r == -ENOENT) /* if fdinfo doesn't exist we assume the process does not exist */ + return -ESRCH; + if (r < 0) + return r; + + p = startswith(fdinfo, "Pid:"); + if (!p) { + p = strstr(fdinfo, "\nPid:"); + if (!p) + return -ENOTTY; /* not a pidfd? */ + + p += 5; + } + + p += strspn(p, WHITESPACE); + p[strcspn(p, WHITESPACE)] = 0; + + return parse_pid(p, ret); +} + static const char *const ioprio_class_table[] = { [IOPRIO_CLASS_NONE] = "none", [IOPRIO_CLASS_RT] = "realtime", diff --git a/shared/systemd/src/basic/process-util.h b/shared/systemd/src/basic/process-util.h index 5f4e174f04..57582738b3 100644 --- a/shared/systemd/src/basic/process-util.h +++ b/shared/systemd/src/basic/process-util.h @@ -147,16 +147,17 @@ void reset_cached_pid(void); int must_be_root(void); typedef enum ForkFlags { - FORK_RESET_SIGNALS = 1 << 0, /* Reset all signal handlers and signal mask */ - FORK_CLOSE_ALL_FDS = 1 << 1, /* Close all open file descriptors in the child, except for 0,1,2 */ - FORK_DEATHSIG = 1 << 2, /* Set PR_DEATHSIG in the child */ - FORK_NULL_STDIO = 1 << 3, /* Connect 0,1,2 to /dev/null */ - FORK_REOPEN_LOG = 1 << 4, /* Reopen log connection */ - FORK_LOG = 1 << 5, /* Log above LOG_DEBUG log level about failures */ - FORK_WAIT = 1 << 6, /* Wait until child exited */ - FORK_NEW_MOUNTNS = 1 << 7, /* Run child in its own mount namespace */ - FORK_MOUNTNS_SLAVE = 1 << 8, /* Make child's mount namespace MS_SLAVE */ - FORK_RLIMIT_NOFILE_SAFE = 1 << 9, /* Set RLIMIT_NOFILE soft limit to 1K for select() compat */ + FORK_RESET_SIGNALS = 1 << 0, /* Reset all signal handlers and signal mask */ + FORK_CLOSE_ALL_FDS = 1 << 1, /* Close all open file descriptors in the child, except for 0,1,2 */ + FORK_DEATHSIG = 1 << 2, /* Set PR_DEATHSIG in the child */ + FORK_NULL_STDIO = 1 << 3, /* Connect 0,1,2 to /dev/null */ + FORK_REOPEN_LOG = 1 << 4, /* Reopen log connection */ + FORK_LOG = 1 << 5, /* Log above LOG_DEBUG log level about failures */ + FORK_WAIT = 1 << 6, /* Wait until child exited */ + FORK_NEW_MOUNTNS = 1 << 7, /* Run child in its own mount namespace */ + FORK_MOUNTNS_SLAVE = 1 << 8, /* Make child's mount namespace MS_SLAVE */ + FORK_RLIMIT_NOFILE_SAFE = 1 << 9, /* Set RLIMIT_NOFILE soft limit to 1K for select() compat */ + FORK_STDOUT_TO_STDERR = 1 << 10, /* Make stdout a copy of stderr */ } ForkFlags; int safe_fork_full(const char *name, const int except_fds[], size_t n_except_fds, ForkFlags flags, pid_t *ret_pid); @@ -197,3 +198,5 @@ assert_cc(TASKS_MAX <= (unsigned long) PID_T_MAX); (pid) = 0; \ _pid_; \ }) + +int pidfd_get_pid(int fd, pid_t *ret); diff --git a/shared/systemd/src/basic/signal-util.c b/shared/systemd/src/basic/signal-util.c new file mode 100644 index 0000000000..cb59f6ca0f --- /dev/null +++ b/shared/systemd/src/basic/signal-util.c @@ -0,0 +1,304 @@ +/* SPDX-License-Identifier: LGPL-2.1+ */ + +#include +#include + +#include "macro.h" +#include "parse-util.h" +#include "signal-util.h" +#include "stdio-util.h" +#include "string-table.h" +#include "string-util.h" + +int reset_all_signal_handlers(void) { + static const struct sigaction sa = { + .sa_handler = SIG_DFL, + .sa_flags = SA_RESTART, + }; + int sig, r = 0; + + for (sig = 1; sig < _NSIG; sig++) { + + /* These two cannot be caught... */ + if (IN_SET(sig, SIGKILL, SIGSTOP)) + continue; + + /* On Linux the first two RT signals are reserved by + * glibc, and sigaction() will return EINVAL for them. */ + if (sigaction(sig, &sa, NULL) < 0) + if (errno != EINVAL && r >= 0) + r = -errno; + } + + return r; +} + +int reset_signal_mask(void) { + sigset_t ss; + + if (sigemptyset(&ss) < 0) + return -errno; + + if (sigprocmask(SIG_SETMASK, &ss, NULL) < 0) + return -errno; + + return 0; +} + +static int sigaction_many_ap(const struct sigaction *sa, int sig, va_list ap) { + int r = 0; + + /* negative signal ends the list. 0 signal is skipped. */ + + if (sig < 0) + return 0; + + if (sig > 0) { + if (sigaction(sig, sa, NULL) < 0) + r = -errno; + } + + while ((sig = va_arg(ap, int)) >= 0) { + + if (sig == 0) + continue; + + if (sigaction(sig, sa, NULL) < 0) { + if (r >= 0) + r = -errno; + } + } + + return r; +} + +int sigaction_many(const struct sigaction *sa, ...) { + va_list ap; + int r; + + va_start(ap, sa); + r = sigaction_many_ap(sa, 0, ap); + va_end(ap); + + return r; +} + +int ignore_signals(int sig, ...) { + + static const struct sigaction sa = { + .sa_handler = SIG_IGN, + .sa_flags = SA_RESTART, + }; + + va_list ap; + int r; + + va_start(ap, sig); + r = sigaction_many_ap(&sa, sig, ap); + va_end(ap); + + return r; +} + +int default_signals(int sig, ...) { + + static const struct sigaction sa = { + .sa_handler = SIG_DFL, + .sa_flags = SA_RESTART, + }; + + va_list ap; + int r; + + va_start(ap, sig); + r = sigaction_many_ap(&sa, sig, ap); + va_end(ap); + + return r; +} + +static int sigset_add_many_ap(sigset_t *ss, va_list ap) { + int sig, r = 0; + + assert(ss); + + while ((sig = va_arg(ap, int)) >= 0) { + + if (sig == 0) + continue; + + if (sigaddset(ss, sig) < 0) { + if (r >= 0) + r = -errno; + } + } + + return r; +} + +int sigset_add_many(sigset_t *ss, ...) { + va_list ap; + int r; + + va_start(ap, ss); + r = sigset_add_many_ap(ss, ap); + va_end(ap); + + return r; +} + +int sigprocmask_many(int how, sigset_t *old, ...) { + va_list ap; + sigset_t ss; + int r; + + if (sigemptyset(&ss) < 0) + return -errno; + + va_start(ap, old); + r = sigset_add_many_ap(&ss, ap); + va_end(ap); + + if (r < 0) + return r; + + if (sigprocmask(how, &ss, old) < 0) + return -errno; + + return 0; +} + +static const char *const __signal_table[] = { + [SIGHUP] = "HUP", + [SIGINT] = "INT", + [SIGQUIT] = "QUIT", + [SIGILL] = "ILL", + [SIGTRAP] = "TRAP", + [SIGABRT] = "ABRT", + [SIGBUS] = "BUS", + [SIGFPE] = "FPE", + [SIGKILL] = "KILL", + [SIGUSR1] = "USR1", + [SIGSEGV] = "SEGV", + [SIGUSR2] = "USR2", + [SIGPIPE] = "PIPE", + [SIGALRM] = "ALRM", + [SIGTERM] = "TERM", +#ifdef SIGSTKFLT + [SIGSTKFLT] = "STKFLT", /* Linux on SPARC doesn't know SIGSTKFLT */ +#endif + [SIGCHLD] = "CHLD", + [SIGCONT] = "CONT", + [SIGSTOP] = "STOP", + [SIGTSTP] = "TSTP", + [SIGTTIN] = "TTIN", + [SIGTTOU] = "TTOU", + [SIGURG] = "URG", + [SIGXCPU] = "XCPU", + [SIGXFSZ] = "XFSZ", + [SIGVTALRM] = "VTALRM", + [SIGPROF] = "PROF", + [SIGWINCH] = "WINCH", + [SIGIO] = "IO", + [SIGPWR] = "PWR", + [SIGSYS] = "SYS" +}; + +DEFINE_PRIVATE_STRING_TABLE_LOOKUP(__signal, int); + +const char *signal_to_string(int signo) { + static thread_local char buf[STRLEN("RTMIN+") + DECIMAL_STR_MAX(int) + 1]; + const char *name; + + name = __signal_to_string(signo); + if (name) + return name; + + if (signo >= SIGRTMIN && signo <= SIGRTMAX) + xsprintf(buf, "RTMIN+%d", signo - SIGRTMIN); + else + xsprintf(buf, "%d", signo); + + return buf; +} + +int signal_from_string(const char *s) { + const char *p; + int signo, r; + + /* Check that the input is a signal number. */ + if (safe_atoi(s, &signo) >= 0) { + if (SIGNAL_VALID(signo)) + return signo; + else + return -ERANGE; + } + + /* Drop "SIG" prefix. */ + if (startswith(s, "SIG")) + s += 3; + + /* Check that the input is a signal name. */ + signo = __signal_from_string(s); + if (signo > 0) + return signo; + + /* Check that the input is RTMIN or + * RTMIN+n (0 <= n <= SIGRTMAX-SIGRTMIN). */ + p = startswith(s, "RTMIN"); + if (p) { + if (*p == '\0') + return SIGRTMIN; + if (*p != '+') + return -EINVAL; + + r = safe_atoi(p, &signo); + if (r < 0) + return r; + + if (signo < 0 || signo > SIGRTMAX - SIGRTMIN) + return -ERANGE; + + return signo + SIGRTMIN; + } + + /* Check that the input is RTMAX or + * RTMAX-n (0 <= n <= SIGRTMAX-SIGRTMIN). */ + p = startswith(s, "RTMAX"); + if (p) { + if (*p == '\0') + return SIGRTMAX; + if (*p != '-') + return -EINVAL; + + r = safe_atoi(p, &signo); + if (r < 0) + return r; + + if (signo > 0 || signo < SIGRTMIN - SIGRTMAX) + return -ERANGE; + + return signo + SIGRTMAX; + } + + return -EINVAL; +} + +void nop_signal_handler(int sig) { + /* nothing here */ +} + +int signal_is_blocked(int sig) { + sigset_t ss; + int r; + + r = pthread_sigmask(SIG_SETMASK, NULL, &ss); + if (r != 0) + return -r; + + r = sigismember(&ss, sig); + if (r < 0) + return -errno; + + return r; +} diff --git a/shared/systemd/src/basic/signal-util.h b/shared/systemd/src/basic/signal-util.h index 92f2804cd2..3909ee341d 100644 --- a/shared/systemd/src/basic/signal-util.h +++ b/shared/systemd/src/basic/signal-util.h @@ -41,3 +41,5 @@ static inline const char* signal_to_string_with_check(int n) { return signal_to_string(n); } + +int signal_is_blocked(int sig); diff --git a/shared/systemd/src/basic/string-util.c b/shared/systemd/src/basic/string-util.c index 8e6aa63806..b477a51534 100644 --- a/shared/systemd/src/basic/string-util.c +++ b/shared/systemd/src/basic/string-util.c @@ -1064,3 +1064,13 @@ bool string_is_safe(const char *p) { return true; } + +char* string_erase(char *x) { + if (!x) + return NULL; + + /* A delicious drop of snake-oil! To be called on memory where we stored passphrases or so, after we + * used them. */ + explicit_bzero_safe(x, strlen(x)); + return x; +} diff --git a/shared/systemd/src/basic/string-util.h b/shared/systemd/src/basic/string-util.h index 04cc82b386..f10af9ad2f 100644 --- a/shared/systemd/src/basic/string-util.h +++ b/shared/systemd/src/basic/string-util.h @@ -278,3 +278,5 @@ static inline char* str_realloc(char **p) { return (*p = t); } + +char* string_erase(char *x); diff --git a/shared/systemd/src/basic/strv.c b/shared/systemd/src/basic/strv.c index 30fab63074..92e528940a 100644 --- a/shared/systemd/src/basic/strv.c +++ b/shared/systemd/src/basic/strv.c @@ -193,7 +193,10 @@ int strv_extend_strv(char ***a, char **b, bool filter_duplicates) { p = strv_length(*a); q = strv_length(b); - t = reallocarray(*a, p + q + 1, sizeof(char *)); + if (p >= SIZE_MAX - q) + return -ENOMEM; + + t = reallocarray(*a, GREEDY_ALLOC_ROUND_UP(p + q + 1), sizeof(char *)); if (!t) return -ENOMEM; @@ -383,19 +386,18 @@ char *strv_join_prefix(char **l, const char *separator, const char *prefix) { int strv_push(char ***l, char *value) { char **c; - size_t n, m; + size_t n; if (!value) return 0; n = strv_length(*l); - /* Increase and check for overflow */ - m = n + 2; - if (m < n) + /* Check for overflow */ + if (n > SIZE_MAX-2) return -ENOMEM; - c = reallocarray(*l, m, sizeof(char*)); + c = reallocarray(*l, GREEDY_ALLOC_ROUND_UP(n + 2), sizeof(char*)); if (!c) return -ENOMEM; @@ -408,19 +410,19 @@ int strv_push(char ***l, char *value) { int strv_push_pair(char ***l, char *a, char *b) { char **c; - size_t n, m; + size_t n; if (!a && !b) return 0; n = strv_length(*l); - /* increase and check for overflow */ - m = n + !!a + !!b + 1; - if (m < n) + /* Check for overflow */ + if (n > SIZE_MAX-3) return -ENOMEM; - c = reallocarray(*l, m, sizeof(char*)); + /* increase and check for overflow */ + c = reallocarray(*l, GREEDY_ALLOC_ROUND_UP(n + !!a + !!b + 1), sizeof(char*)); if (!c) return -ENOMEM; @@ -846,8 +848,10 @@ int strv_extend_n(char ***l, const char *value, size_t n) { /* Adds the value n times to l */ k = strv_length(*l); + if (n >= SIZE_MAX - k) + return -ENOMEM; - nl = reallocarray(*l, k + n + 1, sizeof(char *)); + nl = reallocarray(*l, GREEDY_ALLOC_ROUND_UP(k + n + 1), sizeof(char *)); if (!nl) return -ENOMEM; diff --git a/shared/systemd/src/basic/tmpfile-util.c b/shared/systemd/src/basic/tmpfile-util.c index 7cdaca4e40..2d201e1a57 100644 --- a/shared/systemd/src/basic/tmpfile-util.c +++ b/shared/systemd/src/basic/tmpfile-util.c @@ -19,50 +19,60 @@ #include "tmpfile-util.h" #include "umask-util.h" -int fopen_temporary(const char *path, FILE **_f, char **_temp_path) { - FILE *f; - char *t; - int r, fd; +int fopen_temporary(const char *path, FILE **ret_f, char **ret_temp_path) { + _cleanup_fclose_ FILE *f = NULL; + _cleanup_free_ char *t = NULL; + _cleanup_close_ int fd = -1; + int r; - assert(path); - assert(_f); - assert(_temp_path); + if (path) { + r = tempfn_xxxxxx(path, NULL, &t); + if (r < 0) + return r; + } else { + const char *d; - r = tempfn_xxxxxx(path, NULL, &t); - if (r < 0) - return r; + r = tmp_dir(&d); + if (r < 0) + return r; + + t = path_join(d, "XXXXXX"); + if (!t) + return -ENOMEM; + } fd = mkostemp_safe(t); - if (fd < 0) { - free(t); + if (fd < 0) return -errno; - } /* This assumes that returned FILE object is short-lived and used within the same single-threaded * context and never shared externally, hence locking is not necessary. */ r = fdopen_unlocked(fd, "w", &f); if (r < 0) { - unlink(t); - free(t); - safe_close(fd); + (void) unlink(t); return r; } - *_f = f; - *_temp_path = t; + TAKE_FD(fd); + + if (ret_f) + *ret_f = TAKE_PTR(f); + + if (ret_temp_path) + *ret_temp_path = TAKE_PTR(t); return 0; } /* This is much like mkostemp() but is subject to umask(). */ int mkostemp_safe(char *pattern) { - _unused_ _cleanup_umask_ mode_t u = umask(0077); int fd; assert(pattern); - fd = mkostemp(pattern, O_CLOEXEC); + RUN_WITH_UMASK(0077) + fd = mkostemp(pattern, O_CLOEXEC); if (fd < 0) return -errno; diff --git a/src/systemd/src/libsystemd-network/sd-ipv4acd.c b/src/systemd/src/libsystemd-network/sd-ipv4acd.c index 5a0b6e45dc..d957202a68 100644 --- a/src/systemd/src/libsystemd-network/sd-ipv4acd.c +++ b/src/systemd/src/libsystemd-network/sd-ipv4acd.c @@ -441,7 +441,7 @@ int sd_ipv4acd_is_running(sd_ipv4acd *acd) { return acd->state != IPV4ACD_STATE_INIT; } -int sd_ipv4acd_start(sd_ipv4acd *acd) { +int sd_ipv4acd_start(sd_ipv4acd *acd, bool reset_conflicts) { int r; assert_return(acd, -EINVAL); @@ -458,7 +458,9 @@ int sd_ipv4acd_start(sd_ipv4acd *acd) { safe_close(acd->fd); acd->fd = r; acd->defend_window = 0; - acd->n_conflict = 0; + + if (reset_conflicts) + acd->n_conflict = 0; r = sd_event_add_io(acd->event, &acd->receive_message_event_source, acd->fd, EPOLLIN, ipv4acd_on_packet, acd); if (r < 0) diff --git a/src/systemd/src/libsystemd-network/sd-ipv4ll.c b/src/systemd/src/libsystemd-network/sd-ipv4ll.c index fa9b4f6039..aa1ece41d2 100644 --- a/src/systemd/src/libsystemd-network/sd-ipv4ll.c +++ b/src/systemd/src/libsystemd-network/sd-ipv4ll.c @@ -241,7 +241,7 @@ static int ipv4ll_start_internal(sd_ipv4ll *ll, bool reset_generation) { picked_address = true; } - r = sd_ipv4acd_start(ll->acd); + r = sd_ipv4acd_start(ll->acd, reset_generation); if (r < 0) { /* We couldn't start? If so, let's forget the picked address again, the user might make a change and diff --git a/src/systemd/src/libsystemd/sd-event/event-source.h b/src/systemd/src/libsystemd/sd-event/event-source.h index 99ab8fc169..08eb9b6a61 100644 --- a/src/systemd/src/libsystemd/sd-event/event-source.h +++ b/src/systemd/src/libsystemd/sd-event/event-source.h @@ -34,7 +34,7 @@ typedef enum EventSourceType { * we know how to dispatch it */ typedef enum WakeupType { WAKEUP_NONE, - WAKEUP_EVENT_SOURCE, + WAKEUP_EVENT_SOURCE, /* either I/O or pidfd wakeup */ WAKEUP_CLOCK_DATA, WAKEUP_SIGNAL_DATA, WAKEUP_INOTIFY_DATA, @@ -96,6 +96,12 @@ struct sd_event_source { siginfo_t siginfo; pid_t pid; int options; + int pidfd; + bool registered:1; /* whether the pidfd is registered in the epoll */ + bool pidfd_owned:1; /* close pidfd when event source is freed */ + bool process_owned:1; /* kill+reap process when event source is freed */ + bool exited:1; /* true if process exited (i.e. if there's value in SIGKILLing it if we want to get rid of it) */ + bool waited:1; /* true if process was waited for (i.e. if there's value in waitid(P_PID)'ing it if we want to get rid of it) */ } child; struct { sd_event_handler_t callback; diff --git a/src/systemd/src/libsystemd/sd-event/sd-event.c b/src/systemd/src/libsystemd/sd-event/sd-event.c index b76dbf3d23..4940345791 100644 --- a/src/systemd/src/libsystemd/sd-event/sd-event.c +++ b/src/systemd/src/libsystemd/sd-event/sd-event.c @@ -9,6 +9,7 @@ #include "sd-id128.h" #include "alloc-util.h" +#include "env-util.h" #include "event-source.h" #include "fd-util.h" #include "fs-util.h" @@ -28,6 +29,14 @@ #define DEFAULT_ACCURACY_USEC (250 * USEC_PER_MSEC) +static bool EVENT_SOURCE_WATCH_PIDFD(sd_event_source *s) { + /* Returns true if this is a PID event source and can be implemented by watching EPOLLIN */ + return s && + s->type == SOURCE_CHILD && + s->child.pidfd >= 0 && + s->child.options == WEXITED; +} + static const char* const event_source_type_table[_SOURCE_EVENT_SOURCE_TYPE_MAX] = { [SOURCE_IO] = "io", [SOURCE_TIME_REALTIME] = "realtime", @@ -356,8 +365,6 @@ static bool event_pid_changed(sd_event *e) { } static void source_io_unregister(sd_event_source *s) { - int r; - assert(s); assert(s->type == SOURCE_IO); @@ -367,8 +374,7 @@ static void source_io_unregister(sd_event_source *s) { if (!s->io.registered) return; - r = epoll_ctl(s->event->epoll_fd, EPOLL_CTL_DEL, s->io.fd, NULL); - if (r < 0) + if (epoll_ctl(s->event->epoll_fd, EPOLL_CTL_DEL, s->io.fd, NULL) < 0) log_debug_errno(errno, "Failed to remove source %s (type %s) from epoll: %m", strna(s->description), event_source_type_to_string(s->type)); @@ -404,6 +410,51 @@ static int source_io_register( return 0; } +static void source_child_pidfd_unregister(sd_event_source *s) { + assert(s); + assert(s->type == SOURCE_CHILD); + + if (event_pid_changed(s->event)) + return; + + if (!s->child.registered) + return; + + if (EVENT_SOURCE_WATCH_PIDFD(s)) + if (epoll_ctl(s->event->epoll_fd, EPOLL_CTL_DEL, s->child.pidfd, NULL) < 0) + log_debug_errno(errno, "Failed to remove source %s (type %s) from epoll: %m", + strna(s->description), event_source_type_to_string(s->type)); + + s->child.registered = false; +} + +static int source_child_pidfd_register(sd_event_source *s, int enabled) { + int r; + + assert(s); + assert(s->type == SOURCE_CHILD); + assert(enabled != SD_EVENT_OFF); + + if (EVENT_SOURCE_WATCH_PIDFD(s)) { + struct epoll_event ev; + + ev = (struct epoll_event) { + .events = EPOLLIN | (enabled == SD_EVENT_ONESHOT ? EPOLLONESHOT : 0), + .data.ptr = s, + }; + + if (s->child.registered) + r = epoll_ctl(s->event->epoll_fd, EPOLL_CTL_MOD, s->child.pidfd, &ev); + else + r = epoll_ctl(s->event->epoll_fd, EPOLL_CTL_ADD, s->child.pidfd, &ev); + if (r < 0) + return -errno; + } + + s->child.registered = true; + return 0; +} + static clockid_t event_source_type_to_clock(EventSourceType t) { switch (t) { @@ -614,9 +665,8 @@ static void event_gc_signal_data(sd_event *e, const int64_t *priority, int sig) assert(e); - /* Rechecks if the specified signal is still something we are - * interested in. If not, we'll unmask it, and possibly drop - * the signalfd for it. */ + /* Rechecks if the specified signal is still something we are interested in. If not, we'll unmask it, + * and possibly drop the signalfd for it. */ if (sig == SIGCHLD && e->n_enabled_child_sources > 0) @@ -707,9 +757,13 @@ static void source_disconnect(sd_event_source *s) { } (void) hashmap_remove(s->event->child_sources, PID_TO_PTR(s->child.pid)); - event_gc_signal_data(s->event, &s->priority, SIGCHLD); } + if (EVENT_SOURCE_WATCH_PIDFD(s)) + source_child_pidfd_unregister(s); + else + event_gc_signal_data(s->event, &s->priority, SIGCHLD); + break; case SOURCE_DEFER: @@ -790,6 +844,44 @@ static void source_free(sd_event_source *s) { if (s->type == SOURCE_IO && s->io.owned) s->io.fd = safe_close(s->io.fd); + if (s->type == SOURCE_CHILD) { + /* Eventually the kernel will do this automatically for us, but for now let's emulate this (unreliably) in userspace. */ + + if (s->child.process_owned) { + + if (!s->child.exited) { + bool sent = false; + + if (s->child.pidfd >= 0) { + if (pidfd_send_signal(s->child.pidfd, SIGKILL, NULL, 0) < 0) { + if (errno == ESRCH) /* Already dead */ + sent = true; + else if (!ERRNO_IS_NOT_SUPPORTED(errno)) + log_debug_errno(errno, "Failed to kill process " PID_FMT " via pidfd_send_signal(), re-trying via kill(): %m", + s->child.pid); + } else + sent = true; + } + + if (!sent) + if (kill(s->child.pid, SIGKILL) < 0) + if (errno != ESRCH) /* Already dead */ + log_debug_errno(errno, "Failed to kill process " PID_FMT " via kill(), ignoring: %m", + s->child.pid); + } + + if (!s->child.waited) { + siginfo_t si = {}; + + /* Reap the child if we can */ + (void) waitid(P_PID, s->child.pid, &si, WEXITED); + } + } + + if (s->child.pidfd_owned) + s->child.pidfd = safe_close(s->child.pidfd); + } + if (s->destroy_callback) s->destroy_callback(s->userdata); @@ -1073,7 +1165,6 @@ _public_ int sd_event_add_signal( _cleanup_(source_freep) sd_event_source *s = NULL; struct signal_data *d; - sigset_t ss; int r; assert_return(e, -EINVAL); @@ -1085,11 +1176,10 @@ _public_ int sd_event_add_signal( if (!callback) callback = signal_exit_callback; - r = pthread_sigmask(SIG_SETMASK, NULL, &ss); - if (r != 0) - return -r; - - if (!sigismember(&ss, sig)) + r = signal_is_blocked(sig); + if (r < 0) + return r; + if (r == 0) return -EBUSY; if (!e->signal_sources) { @@ -1124,6 +1214,11 @@ _public_ int sd_event_add_signal( return 0; } +static bool shall_use_pidfd(void) { + /* Mostly relevant for debugging, i.e. this is used in test-event.c to test the event loop once with and once without pidfd */ + return getenv_bool_secure("SYSTEMD_PIDFD") != 0; +} + _public_ int sd_event_add_child( sd_event *e, sd_event_source **ret, @@ -1144,6 +1239,20 @@ _public_ int sd_event_add_child( assert_return(e->state != SD_EVENT_FINISHED, -ESTALE); assert_return(!event_pid_changed(e), -ECHILD); + if (e->n_enabled_child_sources == 0) { + /* Caller must block SIGCHLD before using us to watch children, even if pidfd is available, + * for compatibility with pre-pidfd and because we don't want the reap the child processes + * ourselves, i.e. call waitid(), and don't want Linux' default internal logic for that to + * take effect. + * + * (As an optimization we only do this check on the first child event source created.) */ + r = signal_is_blocked(SIGCHLD); + if (r < 0) + return r; + if (r == 0) + return -EBUSY; + } + r = hashmap_ensure_allocated(&e->child_sources, NULL); if (r < 0) return r; @@ -1155,30 +1264,144 @@ _public_ int sd_event_add_child( if (!s) return -ENOMEM; + s->wakeup = WAKEUP_EVENT_SOURCE; s->child.pid = pid; s->child.options = options; s->child.callback = callback; s->userdata = userdata; s->enabled = SD_EVENT_ONESHOT; + /* We always take a pidfd here if we can, even if we wait for anything else than WEXITED, so that we + * pin the PID, and make regular waitid() handling race-free. */ + + if (shall_use_pidfd()) { + s->child.pidfd = pidfd_open(s->child.pid, 0); + if (s->child.pidfd < 0) { + /* Propagate errors unless the syscall is not supported or blocked */ + if (!ERRNO_IS_NOT_SUPPORTED(errno) && !ERRNO_IS_PRIVILEGE(errno)) + return -errno; + } else + s->child.pidfd_owned = true; /* If we allocate the pidfd we own it by default */ + } else + s->child.pidfd = -1; + + r = hashmap_put(e->child_sources, PID_TO_PTR(pid), s); + if (r < 0) + return r; + + e->n_enabled_child_sources++; + + if (EVENT_SOURCE_WATCH_PIDFD(s)) { + /* We have a pidfd and we only want to watch for exit */ + + r = source_child_pidfd_register(s, s->enabled); + if (r < 0) { + e->n_enabled_child_sources--; + return r; + } + } else { + /* We have no pidfd or we shall wait for some other event than WEXITED */ + + r = event_make_signal_data(e, SIGCHLD, NULL); + if (r < 0) { + e->n_enabled_child_sources--; + return r; + } + + e->need_process_child = true; + } + + if (ret) + *ret = s; + + TAKE_PTR(s); + return 0; +} + +_public_ int sd_event_add_child_pidfd( + sd_event *e, + sd_event_source **ret, + int pidfd, + int options, + sd_event_child_handler_t callback, + void *userdata) { + + + _cleanup_(source_freep) sd_event_source *s = NULL; + pid_t pid; + int r; + + assert_return(e, -EINVAL); + assert_return(e = event_resolve(e), -ENOPKG); + assert_return(pidfd >= 0, -EBADF); + assert_return(!(options & ~(WEXITED|WSTOPPED|WCONTINUED)), -EINVAL); + assert_return(options != 0, -EINVAL); + assert_return(callback, -EINVAL); + assert_return(e->state != SD_EVENT_FINISHED, -ESTALE); + assert_return(!event_pid_changed(e), -ECHILD); + + if (e->n_enabled_child_sources == 0) { + r = signal_is_blocked(SIGCHLD); + if (r < 0) + return r; + if (r == 0) + return -EBUSY; + } + + r = hashmap_ensure_allocated(&e->child_sources, NULL); + if (r < 0) + return r; + + r = pidfd_get_pid(pidfd, &pid); + if (r < 0) + return r; + + if (hashmap_contains(e->child_sources, PID_TO_PTR(pid))) + return -EBUSY; + + s = source_new(e, !ret, SOURCE_CHILD); + if (!s) + return -ENOMEM; + + s->wakeup = WAKEUP_EVENT_SOURCE; + s->child.pidfd = pidfd; + s->child.pid = pid; + s->child.options = options; + s->child.callback = callback; + s->child.pidfd_owned = false; /* If we got the pidfd passed in we don't own it by default (similar to the IO fd case) */ + s->userdata = userdata; + s->enabled = SD_EVENT_ONESHOT; + r = hashmap_put(e->child_sources, PID_TO_PTR(pid), s); if (r < 0) return r; e->n_enabled_child_sources++; - r = event_make_signal_data(e, SIGCHLD, NULL); - if (r < 0) { - e->n_enabled_child_sources--; - return r; - } + if (EVENT_SOURCE_WATCH_PIDFD(s)) { + /* We only want to watch for WEXITED */ - e->need_process_child = true; + r = source_child_pidfd_register(s, s->enabled); + if (r < 0) { + e->n_enabled_child_sources--; + return r; + } + } else { + /* We shall wait for some other event than WEXITED */ + + r = event_make_signal_data(e, SIGCHLD, NULL); + if (r < 0) { + e->n_enabled_child_sources--; + return r; + } + + e->need_process_child = true; + } if (ret) *ret = s; - TAKE_PTR(s); + TAKE_PTR(s); return 0; } @@ -1765,7 +1988,7 @@ _public_ int sd_event_source_set_io_fd(sd_event_source *s, int fd) { return r; } - epoll_ctl(s->event->epoll_fd, EPOLL_CTL_DEL, saved_fd, NULL); + (void) epoll_ctl(s->event->epoll_fd, EPOLL_CTL_DEL, saved_fd, NULL); } return 0; @@ -2026,7 +2249,11 @@ _public_ int sd_event_source_set_enabled(sd_event_source *s, int m) { assert(s->event->n_enabled_child_sources > 0); s->event->n_enabled_child_sources--; - event_gc_signal_data(s->event, &s->priority, SIGCHLD); + if (EVENT_SOURCE_WATCH_PIDFD(s)) + source_child_pidfd_unregister(s); + else + event_gc_signal_data(s->event, &s->priority, SIGCHLD); + break; case SOURCE_EXIT: @@ -2100,12 +2327,25 @@ _public_ int sd_event_source_set_enabled(sd_event_source *s, int m) { s->enabled = m; - r = event_make_signal_data(s->event, SIGCHLD, NULL); - if (r < 0) { - s->enabled = SD_EVENT_OFF; - s->event->n_enabled_child_sources--; - event_gc_signal_data(s->event, &s->priority, SIGCHLD); - return r; + if (EVENT_SOURCE_WATCH_PIDFD(s)) { + /* yes, we have pidfd */ + + r = source_child_pidfd_register(s, s->enabled); + if (r < 0) { + s->enabled = SD_EVENT_OFF; + s->event->n_enabled_child_sources--; + return r; + } + } else { + /* no pidfd, or something other to watch for than WEXITED */ + + r = event_make_signal_data(s->event, SIGCHLD, NULL); + if (r < 0) { + s->enabled = SD_EVENT_OFF; + s->event->n_enabled_child_sources--; + event_gc_signal_data(s->event, &s->priority, SIGCHLD); + return r; + } } break; @@ -2228,6 +2468,98 @@ _public_ int sd_event_source_get_child_pid(sd_event_source *s, pid_t *pid) { return 0; } +_public_ int sd_event_source_get_child_pidfd(sd_event_source *s) { + assert_return(s, -EINVAL); + assert_return(s->type == SOURCE_CHILD, -EDOM); + assert_return(!event_pid_changed(s->event), -ECHILD); + + if (s->child.pidfd < 0) + return -EOPNOTSUPP; + + return s->child.pidfd; +} + +_public_ int sd_event_source_send_child_signal(sd_event_source *s, int sig, const siginfo_t *si, unsigned flags) { + assert_return(s, -EINVAL); + assert_return(s->type == SOURCE_CHILD, -EDOM); + assert_return(!event_pid_changed(s->event), -ECHILD); + assert_return(SIGNAL_VALID(sig), -EINVAL); + + /* If we already have seen indication the process exited refuse sending a signal early. This way we + * can be sure we don't accidentally kill the wrong process on PID reuse when pidfds are not + * available. */ + if (s->child.exited) + return -ESRCH; + + if (s->child.pidfd >= 0) { + siginfo_t copy; + + /* pidfd_send_signal() changes the siginfo_t argument. This is weird, let's hence copy the + * structure here */ + if (si) + copy = *si; + + if (pidfd_send_signal(s->child.pidfd, sig, si ? © : NULL, 0) < 0) { + /* Let's propagate the error only if the system call is not implemented or prohibited */ + if (!ERRNO_IS_NOT_SUPPORTED(errno) && !ERRNO_IS_PRIVILEGE(errno)) + return -errno; + } else + return 0; + } + + /* Flags are only supported for pidfd_send_signal(), not for rt_sigqueueinfo(), hence let's refuse + * this here. */ + if (flags != 0) + return -EOPNOTSUPP; + + if (si) { + /* We use rt_sigqueueinfo() only if siginfo_t is specified. */ + siginfo_t copy = *si; + + if (rt_sigqueueinfo(s->child.pid, sig, ©) < 0) + return -errno; + } else if (kill(s->child.pid, sig) < 0) + return -errno; + + return 0; +} + +_public_ int sd_event_source_get_child_pidfd_own(sd_event_source *s) { + assert_return(s, -EINVAL); + assert_return(s->type == SOURCE_CHILD, -EDOM); + + if (s->child.pidfd < 0) + return -EOPNOTSUPP; + + return s->child.pidfd_owned; +} + +_public_ int sd_event_source_set_child_pidfd_own(sd_event_source *s, int own) { + assert_return(s, -EINVAL); + assert_return(s->type == SOURCE_CHILD, -EDOM); + + if (s->child.pidfd < 0) + return -EOPNOTSUPP; + + s->child.pidfd_owned = own; + return 0; +} + +_public_ int sd_event_source_get_child_process_own(sd_event_source *s) { + assert_return(s, -EINVAL); + assert_return(s->type == SOURCE_CHILD, -EDOM); + + return s->child.process_owned; +} + +_public_ int sd_event_source_set_child_process_own(sd_event_source *s, int own) { + assert_return(s, -EINVAL); + assert_return(s->type == SOURCE_CHILD, -EDOM); + + s->child.process_owned = own; + return 0; +} + _public_ int sd_event_source_get_inotify_mask(sd_event_source *s, uint32_t *mask) { assert_return(s, -EINVAL); assert_return(mask, -EINVAL); @@ -2538,6 +2870,12 @@ static int process_child(sd_event *e) { if (s->enabled == SD_EVENT_OFF) continue; + if (s->child.exited) + continue; + + if (EVENT_SOURCE_WATCH_PIDFD(s)) /* There's a usable pidfd known for this event source? then don't waitid() for it here */ + continue; + zero(s->child.siginfo); r = waitid(P_PID, s->child.pid, &s->child.siginfo, WNOHANG | (s->child.options & WEXITED ? WNOWAIT : 0) | s->child.options); @@ -2547,6 +2885,9 @@ static int process_child(sd_event *e) { if (s->child.siginfo.si_pid != 0) { bool zombie = IN_SET(s->child.siginfo.si_code, CLD_EXITED, CLD_KILLED, CLD_DUMPED); + if (zombie) + s->child.exited = true; + if (!zombie && (s->child.options & WEXITED)) { /* If the child isn't dead then let's * immediately remove the state change @@ -2566,6 +2907,33 @@ static int process_child(sd_event *e) { return 0; } +static int process_pidfd(sd_event *e, sd_event_source *s, uint32_t revents) { + assert(e); + assert(s); + assert(s->type == SOURCE_CHILD); + + if (s->pending) + return 0; + + if (s->enabled == SD_EVENT_OFF) + return 0; + + if (!EVENT_SOURCE_WATCH_PIDFD(s)) + return 0; + + zero(s->child.siginfo); + if (waitid(P_PID, s->child.pid, &s->child.siginfo, WNOHANG | WNOWAIT | s->child.options) < 0) + return -errno; + + if (s->child.siginfo.si_pid == 0) + return 0; + + if (IN_SET(s->child.siginfo.si_code, CLD_EXITED, CLD_KILLED, CLD_DUMPED)) + s->child.exited = true; + + return source_set_pending(s, true); +} + static int process_signal(sd_event *e, struct signal_data *d, uint32_t events) { bool read_one = false; int r; @@ -2850,8 +3218,10 @@ static int source_dispatch(sd_event_source *s) { r = s->child.callback(s, &s->child.siginfo, s->userdata); /* Now, reap the PID for good. */ - if (zombie) + if (zombie) { (void) waitid(P_PID, s->child.pid, &s->child.siginfo, WNOHANG|WEXITED); + s->child.waited = true; + } break; } @@ -3052,6 +3422,11 @@ _public_ int sd_event_prepare(sd_event *e) { assert_return(e->state != SD_EVENT_FINISHED, -ESTALE); assert_return(e->state == SD_EVENT_INITIAL, -EBUSY); + /* Let's check that if we are a default event loop we are executed in the correct thread. We only do + * this check here once, since gettid() is typically not cached, and thus want to minimize + * syscalls */ + assert_return(!e->default_event_ptr || e->tid == gettid(), -EREMOTEIO); + if (e->exit_requested) goto pending; @@ -3147,12 +3522,33 @@ _public_ int sd_event_wait(sd_event *e, uint64_t timeout) { switch (*t) { - case WAKEUP_EVENT_SOURCE: - r = process_io(e, ev_queue[i].data.ptr, ev_queue[i].events); + case WAKEUP_EVENT_SOURCE: { + sd_event_source *s = ev_queue[i].data.ptr; + + assert(s); + + switch (s->type) { + + case SOURCE_IO: + r = process_io(e, s, ev_queue[i].events); + break; + + case SOURCE_CHILD: + r = process_pidfd(e, s, ev_queue[i].events); + break; + + default: + assert_not_reached("Unexpected event source type"); + } + break; + } case WAKEUP_CLOCK_DATA: { struct clock_data *d = ev_queue[i].data.ptr; + + assert(d); + r = flush_timer(e, d->fd, ev_queue[i].events, &d->next); break; } @@ -3476,7 +3872,7 @@ _public_ int sd_event_set_watchdog(sd_event *e, int b) { } else { if (e->watchdog_fd >= 0) { - epoll_ctl(e->epoll_fd, EPOLL_CTL_DEL, e->watchdog_fd, NULL); + (void) epoll_ctl(e->epoll_fd, EPOLL_CTL_DEL, e->watchdog_fd, NULL); e->watchdog_fd = safe_close(e->watchdog_fd); } } diff --git a/src/systemd/src/libsystemd/sd-id128/id128-util.c b/src/systemd/src/libsystemd/sd-id128/id128-util.c index 9ffd594ee6..985872b82d 100644 --- a/src/systemd/src/libsystemd/sd-id128/id128-util.c +++ b/src/systemd/src/libsystemd/sd-id128/id128-util.c @@ -11,7 +11,7 @@ #include "io-util.h" #include "stdio-util.h" -char *id128_to_uuid_string(sd_id128_t id, char s[37]) { +char *id128_to_uuid_string(sd_id128_t id, char s[static ID128_UUID_STRING_MAX]) { unsigned n, k = 0; assert(s); diff --git a/src/systemd/src/libsystemd/sd-id128/id128-util.h b/src/systemd/src/libsystemd/sd-id128/id128-util.h index 82a69a77f3..fe0149a8aa 100644 --- a/src/systemd/src/libsystemd/sd-id128/id128-util.h +++ b/src/systemd/src/libsystemd/sd-id128/id128-util.h @@ -8,7 +8,9 @@ #include "hash-funcs.h" #include "macro.h" -char *id128_to_uuid_string(sd_id128_t id, char s[37]); +#define ID128_UUID_STRING_MAX 37 + +char *id128_to_uuid_string(sd_id128_t id, char s[static ID128_UUID_STRING_MAX]); bool id128_is_valid(const char *s) _pure_; diff --git a/src/systemd/src/systemd/sd-event.h b/src/systemd/src/systemd/sd-event.h index b14c92697b..2ec726a897 100644 --- a/src/systemd/src/systemd/sd-event.h +++ b/src/systemd/src/systemd/sd-event.h @@ -23,6 +23,7 @@ #include #include #include +#include #include #include "_sd-common.h" @@ -89,6 +90,7 @@ int sd_event_add_io(sd_event *e, sd_event_source **s, int fd, uint32_t events, s int sd_event_add_time(sd_event *e, sd_event_source **s, clockid_t clock, uint64_t usec, uint64_t accuracy, sd_event_time_handler_t callback, void *userdata); int sd_event_add_signal(sd_event *e, sd_event_source **s, int sig, sd_event_signal_handler_t callback, void *userdata); int sd_event_add_child(sd_event *e, sd_event_source **s, pid_t pid, int options, sd_event_child_handler_t callback, void *userdata); +int sd_event_add_child_pidfd(sd_event *e, sd_event_source **s, int pidfd, int options, sd_event_child_handler_t callback, void *userdata); int sd_event_add_inotify(sd_event *e, sd_event_source **s, const char *path, uint32_t mask, sd_event_inotify_handler_t callback, void *userdata); int sd_event_add_defer(sd_event *e, sd_event_source **s, sd_event_handler_t callback, void *userdata); int sd_event_add_post(sd_event *e, sd_event_source **s, sd_event_handler_t callback, void *userdata); @@ -141,6 +143,16 @@ int sd_event_source_set_time_accuracy(sd_event_source *s, uint64_t usec); int sd_event_source_get_time_clock(sd_event_source *s, clockid_t *clock); int sd_event_source_get_signal(sd_event_source *s); int sd_event_source_get_child_pid(sd_event_source *s, pid_t *pid); +int sd_event_source_get_child_pidfd(sd_event_source *s); +int sd_event_source_get_child_pidfd_own(sd_event_source *s); +int sd_event_source_set_child_pidfd_own(sd_event_source *s, int own); +int sd_event_source_get_child_process_own(sd_event_source *s); +int sd_event_source_set_child_process_own(sd_event_source *s, int own); +#if defined _GNU_SOURCE || (defined _POSIX_C_SOURCE && _POSIX_C_SOURCE >= 199309L) +int sd_event_source_send_child_signal(sd_event_source *s, int sig, const siginfo_t *si, unsigned flags); +#else +int sd_event_source_send_child_signal(sd_event_source *s, int sig, const void *si, unsigned flags); +#endif int sd_event_source_get_inotify_mask(sd_event_source *s, uint32_t *ret); int sd_event_source_set_destroy_callback(sd_event_source *s, sd_event_destroy_t callback); int sd_event_source_get_destroy_callback(sd_event_source *s, sd_event_destroy_t *ret); diff --git a/src/systemd/src/systemd/sd-ipv4acd.h b/src/systemd/src/systemd/sd-ipv4acd.h index 039ed3c7f2..ebf723fc22 100644 --- a/src/systemd/src/systemd/sd-ipv4acd.h +++ b/src/systemd/src/systemd/sd-ipv4acd.h @@ -20,6 +20,7 @@ #include #include +#include #include "sd-event.h" @@ -44,7 +45,7 @@ int sd_ipv4acd_set_mac(sd_ipv4acd *acd, const struct ether_addr *addr); int sd_ipv4acd_set_ifindex(sd_ipv4acd *acd, int interface_index); int sd_ipv4acd_set_address(sd_ipv4acd *acd, const struct in_addr *address); int sd_ipv4acd_is_running(sd_ipv4acd *acd); -int sd_ipv4acd_start(sd_ipv4acd *acd); +int sd_ipv4acd_start(sd_ipv4acd *acd, bool reset_conflicts); int sd_ipv4acd_stop(sd_ipv4acd *acd); sd_ipv4acd *sd_ipv4acd_ref(sd_ipv4acd *acd); sd_ipv4acd *sd_ipv4acd_unref(sd_ipv4acd *acd); From ec0adbfaf0175fc7f54b3f4a6035240a837651e6 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 16 Dec 2019 17:41:16 +0100 Subject: [PATCH 099/109] checkpatch: catch "gs_free GError *" declations --- contrib/scripts/checkpatch.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/scripts/checkpatch.pl b/contrib/scripts/checkpatch.pl index bf1ccb1ccc..98693f8dc3 100755 --- a/contrib/scripts/checkpatch.pl +++ b/contrib/scripts/checkpatch.pl @@ -189,6 +189,7 @@ complain ("Don't add Emacs editor formatting hints to source files") if $line_no complain ("XXX marker are reserved for development while work-in-progress. Use TODO or FIXME comment instead?") if $line =~ /\bXXX\b/; complain ("This gtk-doc annotation looks wrong") if $line =~ /\*.*\( *(transfer-(none|container|full)|allow none) *\) *(:|\()/; complain ("Prefer nm_assert() or g_return*() to g_assert*()") if $line =~ /g_assert/ and not $filename =~ /\/tests\//; +complain ("Use gs_free_error with GError variables") if $line =~ /\bgs_free\b +GError *\*/; new_hunk if $_ eq ''; my ($this_indent) = /^(\s*)/; From 4a3ca7115aabbbe9dfb649d116b06e3af73d4bdf Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 16 Dec 2019 17:39:17 +0100 Subject: [PATCH 100/109] all: fix wrong "gs_free GError *" declarations This is a bug and leads either to a leak or a crash. --- clients/cli/connections.c | 2 +- shared/nm-test-utils-impl.c | 2 +- src/devices/bluetooth/nm-bluez-manager.c | 4 ++-- src/devices/bluetooth/nm-bluez5-dun.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 25751c10dd..a4fbf6df3a 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -7649,7 +7649,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t } } else { gs_free char *prop_name = NULL; - gs_free GError *tmp_err = NULL; + gs_free_error GError *tmp_err = NULL; prop_name = is_property_valid (ss, cmd_arg_p, &tmp_err); if (prop_name) { diff --git a/shared/nm-test-utils-impl.c b/shared/nm-test-utils-impl.c index 6923238efc..0805d0b946 100644 --- a/shared/nm-test-utils-impl.c +++ b/shared/nm-test-utils-impl.c @@ -435,7 +435,7 @@ _nmtstc_client_new_cb (GObject *source_object, static NMClient * _nmtstc_client_new (gboolean sync) { - gs_free GError *error = NULL; + gs_free_error GError *error = NULL; NMClient *client; /* Create a NMClient instance synchronously, and arbitrarily use either diff --git a/src/devices/bluetooth/nm-bluez-manager.c b/src/devices/bluetooth/nm-bluez-manager.c index 0b606f0fb3..ef087d83e9 100644 --- a/src/devices/bluetooth/nm-bluez-manager.c +++ b/src/devices/bluetooth/nm-bluez-manager.c @@ -287,7 +287,7 @@ _network_server_register_req_data_complete (NetworkServerRegisterReqData *r_req_ nm_clear_g_cancellable (&r_req_data->int_cancellable); if (r_req_data->callback) { - gs_free GError *error_cancelled = NULL; + gs_free_error GError *error_cancelled = NULL; if (g_cancellable_set_error_if_cancelled (r_req_data->ext_cancellable, &error_cancelled)) error = error_cancelled; @@ -314,7 +314,7 @@ _device_connect_req_data_complete (DeviceConnectReqData *c_req_data, nm_clear_g_source (&c_req_data->timeout_wait_connect_id); if (c_req_data->callback) { - gs_free GError *error_cancelled = NULL; + gs_free_error GError *error_cancelled = NULL; if (g_cancellable_set_error_if_cancelled (c_req_data->ext_cancellable, &error_cancelled)) { error = error_cancelled; diff --git a/src/devices/bluetooth/nm-bluez5-dun.c b/src/devices/bluetooth/nm-bluez5-dun.c index 063c3db575..3ddfb0ef44 100644 --- a/src/devices/bluetooth/nm-bluez5-dun.c +++ b/src/devices/bluetooth/nm-bluez5-dun.c @@ -268,7 +268,7 @@ _connect_socket_connect_cb (GIOChannel *stream, gpointer user_data) { NMBluez5DunContext *context = user_data; - gs_free GError *error = NULL; + gs_free_error GError *error = NULL; int errsv = 0; socklen_t slen = sizeof(errsv); int r; @@ -471,7 +471,7 @@ _connect_sdp_search_io_cb (GIOChannel *io_channel, gpointer user_data) { NMBluez5DunContext *context = user_data; - gs_free GError *error = NULL; + gs_free_error GError *error = NULL; int errsv; if (condition & (G_IO_ERR | G_IO_HUP | G_IO_NVAL)) { From ce36494c0a483b51275b9818d58e1ad150e4efbc Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 16 Dec 2019 16:56:58 +0100 Subject: [PATCH 101/109] shared: add nm_dbus_error_is() helper --- shared/nm-glib-aux/nm-dbus-aux.c | 23 +++++++++++++++++++++++ shared/nm-glib-aux/nm-dbus-aux.h | 13 +++++++++++++ 2 files changed, 36 insertions(+) diff --git a/shared/nm-glib-aux/nm-dbus-aux.c b/shared/nm-glib-aux/nm-dbus-aux.c index f55958b489..75b282bc14 100644 --- a/shared/nm-glib-aux/nm-dbus-aux.c +++ b/shared/nm-glib-aux/nm-dbus-aux.c @@ -341,3 +341,26 @@ nm_dbus_connection_call_finish_variant_strip_dbus_error_cb (GObject *source, { _call_finish_cb (source, result, user_data, FALSE, TRUE); } + +/*****************************************************************************/ + +gboolean +_nm_dbus_error_is (GError *error, ...) +{ + gs_free char *dbus_error = NULL; + const char *name; + va_list ap; + + dbus_error = g_dbus_error_get_remote_error (error); + if (!dbus_error) + return FALSE; + + va_start (ap, error); + while ((name = va_arg (ap, const char *))) { + if (nm_streq (dbus_error, name)) + return TRUE; + } + va_end (ap); + + return FALSE; +} diff --git a/shared/nm-glib-aux/nm-dbus-aux.h b/shared/nm-glib-aux/nm-dbus-aux.h index bf7731d22f..840e23c275 100644 --- a/shared/nm-glib-aux/nm-dbus-aux.h +++ b/shared/nm-glib-aux/nm-dbus-aux.h @@ -192,4 +192,17 @@ void nm_dbus_connection_call_finish_variant_strip_dbus_error_cb (GObject *source /*****************************************************************************/ +gboolean _nm_dbus_error_is (GError *error, ...) G_GNUC_NULL_TERMINATED; + +#define nm_dbus_error_is(error, ...) \ + ({ \ + GError *const _error = (error); \ + \ + _error && _nm_dbus_error_is (_error, __VA_ARGS__, NULL); \ + }) + +#define NM_DBUS_ERROR_NAME_UNKNOWN_METHOD "org.freedesktop.DBus.Error.UnknownMethod" + +/*****************************************************************************/ + #endif /* __NM_DBUS_AUX_H__ */ From 1b00fd2fd202e228200a98c76ac455a0ddb87c81 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 16 Dec 2019 14:02:48 +0100 Subject: [PATCH 102/109] shared: implement _LOGx() macros using log levels that are themself defines "nm-glib-aux/nm-logging-fwd.h" provides macros like _LOGD() to be reused by various parts which implement logging (by defining _NMLOG() accordingly). libnm also has logging, however it uses different logging levels aside LOGD_DEBUG. Instead, implement _LOGD() using a define _LOGL_DEBUG, so that libnm can redefine thos _LOGL_DEBUG defines and use the _LOGD() macro. --- shared/nm-glib-aux/nm-logging-fwd.h | 132 +++++++++++++++------------- 1 file changed, 69 insertions(+), 63 deletions(-) diff --git a/shared/nm-glib-aux/nm-logging-fwd.h b/shared/nm-glib-aux/nm-logging-fwd.h index a5783a6ff1..4766178835 100644 --- a/shared/nm-glib-aux/nm-logging-fwd.h +++ b/shared/nm-glib-aux/nm-logging-fwd.h @@ -137,39 +137,45 @@ extern void _nm_utils_monotonic_timestamp_initialized (const struct timespec *tp /*****************************************************************************/ +#define _LOGL_TRACE LOGL_TRACE +#define _LOGL_DEBUG LOGL_DEBUG +#define _LOGL_INFO LOGL_INFO +#define _LOGL_WARN LOGL_WARN +#define _LOGL_ERR LOGL_ERR + /* This is the default definition of _NMLOG_ENABLED(). Special implementations * might want to undef this and redefine it. */ #define _NMLOG_ENABLED(level) ( nm_logging_enabled ((level), (_NMLOG_DOMAIN)) ) -#define _LOGT(...) _NMLOG (LOGL_TRACE, __VA_ARGS__) -#define _LOGD(...) _NMLOG (LOGL_DEBUG, __VA_ARGS__) -#define _LOGI(...) _NMLOG (LOGL_INFO , __VA_ARGS__) -#define _LOGW(...) _NMLOG (LOGL_WARN , __VA_ARGS__) -#define _LOGE(...) _NMLOG (LOGL_ERR , __VA_ARGS__) +#define _LOGT(...) _NMLOG (_LOGL_TRACE, __VA_ARGS__) +#define _LOGD(...) _NMLOG (_LOGL_DEBUG, __VA_ARGS__) +#define _LOGI(...) _NMLOG (_LOGL_INFO , __VA_ARGS__) +#define _LOGW(...) _NMLOG (_LOGL_WARN , __VA_ARGS__) +#define _LOGE(...) _NMLOG (_LOGL_ERR , __VA_ARGS__) -#define _LOGT_ENABLED(...) _NMLOG_ENABLED (LOGL_TRACE, ##__VA_ARGS__) -#define _LOGD_ENABLED(...) _NMLOG_ENABLED (LOGL_DEBUG, ##__VA_ARGS__) -#define _LOGI_ENABLED(...) _NMLOG_ENABLED (LOGL_INFO , ##__VA_ARGS__) -#define _LOGW_ENABLED(...) _NMLOG_ENABLED (LOGL_WARN , ##__VA_ARGS__) -#define _LOGE_ENABLED(...) _NMLOG_ENABLED (LOGL_ERR , ##__VA_ARGS__) +#define _LOGT_ENABLED(...) _NMLOG_ENABLED (_LOGL_TRACE, ##__VA_ARGS__) +#define _LOGD_ENABLED(...) _NMLOG_ENABLED (_LOGL_DEBUG, ##__VA_ARGS__) +#define _LOGI_ENABLED(...) _NMLOG_ENABLED (_LOGL_INFO , ##__VA_ARGS__) +#define _LOGW_ENABLED(...) _NMLOG_ENABLED (_LOGL_WARN , ##__VA_ARGS__) +#define _LOGE_ENABLED(...) _NMLOG_ENABLED (_LOGL_ERR , ##__VA_ARGS__) -#define _LOGT_err(errsv, ...) _NMLOG_err (errsv, LOGL_TRACE, __VA_ARGS__) -#define _LOGD_err(errsv, ...) _NMLOG_err (errsv, LOGL_DEBUG, __VA_ARGS__) -#define _LOGI_err(errsv, ...) _NMLOG_err (errsv, LOGL_INFO , __VA_ARGS__) -#define _LOGW_err(errsv, ...) _NMLOG_err (errsv, LOGL_WARN , __VA_ARGS__) -#define _LOGE_err(errsv, ...) _NMLOG_err (errsv, LOGL_ERR , __VA_ARGS__) +#define _LOGT_err(errsv, ...) _NMLOG_err (errsv, _LOGL_TRACE, __VA_ARGS__) +#define _LOGD_err(errsv, ...) _NMLOG_err (errsv, _LOGL_DEBUG, __VA_ARGS__) +#define _LOGI_err(errsv, ...) _NMLOG_err (errsv, _LOGL_INFO , __VA_ARGS__) +#define _LOGW_err(errsv, ...) _NMLOG_err (errsv, _LOGL_WARN , __VA_ARGS__) +#define _LOGE_err(errsv, ...) _NMLOG_err (errsv, _LOGL_ERR , __VA_ARGS__) /* _LOGT() and _LOGt() both log with level TRACE, but the latter is disabled by default, * unless building with --with-more-logging. */ #if NM_MORE_LOGGING -#define _LOGt_ENABLED(...) _NMLOG_ENABLED (LOGL_TRACE, ##__VA_ARGS__) -#define _LOGt(...) _NMLOG (LOGL_TRACE, __VA_ARGS__) -#define _LOGt_err(errsv, ...) _NMLOG_err (errsv, LOGL_TRACE, __VA_ARGS__) +#define _LOGt_ENABLED(...) _NMLOG_ENABLED (_LOGL_TRACE, ##__VA_ARGS__) +#define _LOGt(...) _NMLOG (_LOGL_TRACE, __VA_ARGS__) +#define _LOGt_err(errsv, ...) _NMLOG_err (errsv, _LOGL_TRACE, __VA_ARGS__) #else /* still call the logging macros to get compile time checks, but they will be optimized out. */ -#define _LOGt_ENABLED(...) ( FALSE && (_NMLOG_ENABLED (LOGL_TRACE, ##__VA_ARGS__)) ) -#define _LOGt(...) G_STMT_START { if (FALSE) { _NMLOG (LOGL_TRACE, __VA_ARGS__); } } G_STMT_END -#define _LOGt_err(errsv, ...) G_STMT_START { if (FALSE) { _NMLOG_err (errsv, LOGL_TRACE, __VA_ARGS__); } } G_STMT_END +#define _LOGt_ENABLED(...) ( FALSE && (_NMLOG_ENABLED (_LOGL_TRACE, ##__VA_ARGS__)) ) +#define _LOGt(...) G_STMT_START { if (FALSE) { _NMLOG (_LOGL_TRACE, __VA_ARGS__); } } G_STMT_END +#define _LOGt_err(errsv, ...) G_STMT_START { if (FALSE) { _NMLOG_err (errsv, _LOGL_TRACE, __VA_ARGS__); } } G_STMT_END #endif /*****************************************************************************/ @@ -183,64 +189,64 @@ extern void _nm_utils_monotonic_timestamp_initialized (const struct timespec *tp #define _NMLOG2_ENABLED(level) ( nm_logging_enabled ((level), (_NMLOG2_DOMAIN)) ) -#define _LOG2T(...) _NMLOG2 (LOGL_TRACE, __VA_ARGS__) -#define _LOG2D(...) _NMLOG2 (LOGL_DEBUG, __VA_ARGS__) -#define _LOG2I(...) _NMLOG2 (LOGL_INFO , __VA_ARGS__) -#define _LOG2W(...) _NMLOG2 (LOGL_WARN , __VA_ARGS__) -#define _LOG2E(...) _NMLOG2 (LOGL_ERR , __VA_ARGS__) +#define _LOG2T(...) _NMLOG2 (_LOGL_TRACE, __VA_ARGS__) +#define _LOG2D(...) _NMLOG2 (_LOGL_DEBUG, __VA_ARGS__) +#define _LOG2I(...) _NMLOG2 (_LOGL_INFO , __VA_ARGS__) +#define _LOG2W(...) _NMLOG2 (_LOGL_WARN , __VA_ARGS__) +#define _LOG2E(...) _NMLOG2 (_LOGL_ERR , __VA_ARGS__) -#define _LOG2T_ENABLED(...) _NMLOG2_ENABLED (LOGL_TRACE, ##__VA_ARGS__) -#define _LOG2D_ENABLED(...) _NMLOG2_ENABLED (LOGL_DEBUG, ##__VA_ARGS__) -#define _LOG2I_ENABLED(...) _NMLOG2_ENABLED (LOGL_INFO , ##__VA_ARGS__) -#define _LOG2W_ENABLED(...) _NMLOG2_ENABLED (LOGL_WARN , ##__VA_ARGS__) -#define _LOG2E_ENABLED(...) _NMLOG2_ENABLED (LOGL_ERR , ##__VA_ARGS__) +#define _LOG2T_ENABLED(...) _NMLOG2_ENABLED (_LOGL_TRACE, ##__VA_ARGS__) +#define _LOG2D_ENABLED(...) _NMLOG2_ENABLED (_LOGL_DEBUG, ##__VA_ARGS__) +#define _LOG2I_ENABLED(...) _NMLOG2_ENABLED (_LOGL_INFO , ##__VA_ARGS__) +#define _LOG2W_ENABLED(...) _NMLOG2_ENABLED (_LOGL_WARN , ##__VA_ARGS__) +#define _LOG2E_ENABLED(...) _NMLOG2_ENABLED (_LOGL_ERR , ##__VA_ARGS__) -#define _LOG2T_err(errsv, ...) _NMLOG2_err (errsv, LOGL_TRACE, __VA_ARGS__) -#define _LOG2D_err(errsv, ...) _NMLOG2_err (errsv, LOGL_DEBUG, __VA_ARGS__) -#define _LOG2I_err(errsv, ...) _NMLOG2_err (errsv, LOGL_INFO , __VA_ARGS__) -#define _LOG2W_err(errsv, ...) _NMLOG2_err (errsv, LOGL_WARN , __VA_ARGS__) -#define _LOG2E_err(errsv, ...) _NMLOG2_err (errsv, LOGL_ERR , __VA_ARGS__) +#define _LOG2T_err(errsv, ...) _NMLOG2_err (errsv, _LOGL_TRACE, __VA_ARGS__) +#define _LOG2D_err(errsv, ...) _NMLOG2_err (errsv, _LOGL_DEBUG, __VA_ARGS__) +#define _LOG2I_err(errsv, ...) _NMLOG2_err (errsv, _LOGL_INFO , __VA_ARGS__) +#define _LOG2W_err(errsv, ...) _NMLOG2_err (errsv, _LOGL_WARN , __VA_ARGS__) +#define _LOG2E_err(errsv, ...) _NMLOG2_err (errsv, _LOGL_ERR , __VA_ARGS__) #if NM_MORE_LOGGING -#define _LOG2t_ENABLED(...) _NMLOG2_ENABLED (LOGL_TRACE, ##__VA_ARGS__) -#define _LOG2t(...) _NMLOG2 (LOGL_TRACE, __VA_ARGS__) -#define _LOG2t_err(errsv, ...) _NMLOG2_err (errsv, LOGL_TRACE, __VA_ARGS__) +#define _LOG2t_ENABLED(...) _NMLOG2_ENABLED (_LOGL_TRACE, ##__VA_ARGS__) +#define _LOG2t(...) _NMLOG2 (_LOGL_TRACE, __VA_ARGS__) +#define _LOG2t_err(errsv, ...) _NMLOG2_err (errsv, _LOGL_TRACE, __VA_ARGS__) #else /* still call the logging macros to get compile time checks, but they will be optimized out. */ -#define _LOG2t_ENABLED(...) ( FALSE && (_NMLOG2_ENABLED (LOGL_TRACE, ##__VA_ARGS__)) ) -#define _LOG2t(...) G_STMT_START { if (FALSE) { _NMLOG2 (LOGL_TRACE, __VA_ARGS__); } } G_STMT_END -#define _LOG2t_err(errsv, ...) G_STMT_START { if (FALSE) { _NMLOG2_err (errsv, LOGL_TRACE, __VA_ARGS__); } } G_STMT_END +#define _LOG2t_ENABLED(...) ( FALSE && (_NMLOG2_ENABLED (_LOGL_TRACE, ##__VA_ARGS__)) ) +#define _LOG2t(...) G_STMT_START { if (FALSE) { _NMLOG2 (_LOGL_TRACE, __VA_ARGS__); } } G_STMT_END +#define _LOG2t_err(errsv, ...) G_STMT_START { if (FALSE) { _NMLOG2_err (errsv, _LOGL_TRACE, __VA_ARGS__); } } G_STMT_END #endif #define _NMLOG3_ENABLED(level) ( nm_logging_enabled ((level), (_NMLOG3_DOMAIN)) ) -#define _LOG3T(...) _NMLOG3 (LOGL_TRACE, __VA_ARGS__) -#define _LOG3D(...) _NMLOG3 (LOGL_DEBUG, __VA_ARGS__) -#define _LOG3I(...) _NMLOG3 (LOGL_INFO , __VA_ARGS__) -#define _LOG3W(...) _NMLOG3 (LOGL_WARN , __VA_ARGS__) -#define _LOG3E(...) _NMLOG3 (LOGL_ERR , __VA_ARGS__) +#define _LOG3T(...) _NMLOG3 (_LOGL_TRACE, __VA_ARGS__) +#define _LOG3D(...) _NMLOG3 (_LOGL_DEBUG, __VA_ARGS__) +#define _LOG3I(...) _NMLOG3 (_LOGL_INFO , __VA_ARGS__) +#define _LOG3W(...) _NMLOG3 (_LOGL_WARN , __VA_ARGS__) +#define _LOG3E(...) _NMLOG3 (_LOGL_ERR , __VA_ARGS__) -#define _LOG3T_ENABLED(...) _NMLOG3_ENABLED (LOGL_TRACE, ##__VA_ARGS__) -#define _LOG3D_ENABLED(...) _NMLOG3_ENABLED (LOGL_DEBUG, ##__VA_ARGS__) -#define _LOG3I_ENABLED(...) _NMLOG3_ENABLED (LOGL_INFO , ##__VA_ARGS__) -#define _LOG3W_ENABLED(...) _NMLOG3_ENABLED (LOGL_WARN , ##__VA_ARGS__) -#define _LOG3E_ENABLED(...) _NMLOG3_ENABLED (LOGL_ERR , ##__VA_ARGS__) +#define _LOG3T_ENABLED(...) _NMLOG3_ENABLED (_LOGL_TRACE, ##__VA_ARGS__) +#define _LOG3D_ENABLED(...) _NMLOG3_ENABLED (_LOGL_DEBUG, ##__VA_ARGS__) +#define _LOG3I_ENABLED(...) _NMLOG3_ENABLED (_LOGL_INFO , ##__VA_ARGS__) +#define _LOG3W_ENABLED(...) _NMLOG3_ENABLED (_LOGL_WARN , ##__VA_ARGS__) +#define _LOG3E_ENABLED(...) _NMLOG3_ENABLED (_LOGL_ERR , ##__VA_ARGS__) -#define _LOG3T_err(errsv, ...) _NMLOG3_err (errsv, LOGL_TRACE, __VA_ARGS__) -#define _LOG3D_err(errsv, ...) _NMLOG3_err (errsv, LOGL_DEBUG, __VA_ARGS__) -#define _LOG3I_err(errsv, ...) _NMLOG3_err (errsv, LOGL_INFO , __VA_ARGS__) -#define _LOG3W_err(errsv, ...) _NMLOG3_err (errsv, LOGL_WARN , __VA_ARGS__) -#define _LOG3E_err(errsv, ...) _NMLOG3_err (errsv, LOGL_ERR , __VA_ARGS__) +#define _LOG3T_err(errsv, ...) _NMLOG3_err (errsv, _LOGL_TRACE, __VA_ARGS__) +#define _LOG3D_err(errsv, ...) _NMLOG3_err (errsv, _LOGL_DEBUG, __VA_ARGS__) +#define _LOG3I_err(errsv, ...) _NMLOG3_err (errsv, _LOGL_INFO , __VA_ARGS__) +#define _LOG3W_err(errsv, ...) _NMLOG3_err (errsv, _LOGL_WARN , __VA_ARGS__) +#define _LOG3E_err(errsv, ...) _NMLOG3_err (errsv, _LOGL_ERR , __VA_ARGS__) #if NM_MORE_LOGGING -#define _LOG3t_ENABLED(...) _NMLOG3_ENABLED (LOGL_TRACE, ##__VA_ARGS__) -#define _LOG3t(...) _NMLOG3 (LOGL_TRACE, __VA_ARGS__) -#define _LOG3t_err(errsv, ...) _NMLOG3_err (errsv, LOGL_TRACE, __VA_ARGS__) +#define _LOG3t_ENABLED(...) _NMLOG3_ENABLED (_LOGL_TRACE, ##__VA_ARGS__) +#define _LOG3t(...) _NMLOG3 (_LOGL_TRACE, __VA_ARGS__) +#define _LOG3t_err(errsv, ...) _NMLOG3_err (errsv, _LOGL_TRACE, __VA_ARGS__) #else /* still call the logging macros to get compile time checks, but they will be optimized out. */ -#define _LOG3t_ENABLED(...) ( FALSE && (_NMLOG3_ENABLED (LOGL_TRACE, ##__VA_ARGS__)) ) -#define _LOG3t(...) G_STMT_START { if (FALSE) { _NMLOG3 (LOGL_TRACE, __VA_ARGS__); } } G_STMT_END -#define _LOG3t_err(errsv, ...) G_STMT_START { if (FALSE) { _NMLOG3_err (errsv, LOGL_TRACE, __VA_ARGS__); } } G_STMT_END +#define _LOG3t_ENABLED(...) ( FALSE && (_NMLOG3_ENABLED (_LOGL_TRACE, ##__VA_ARGS__)) ) +#define _LOG3t(...) G_STMT_START { if (FALSE) { _NMLOG3 (_LOGL_TRACE, __VA_ARGS__); } } G_STMT_END +#define _LOG3t_err(errsv, ...) G_STMT_START { if (FALSE) { _NMLOG3_err (errsv, _LOGL_TRACE, __VA_ARGS__); } } G_STMT_END #endif /*****************************************************************************/ From 1b0f0f8c47e58f5c14778ba77f0ca43026c73d11 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 16 Dec 2019 14:05:47 +0100 Subject: [PATCH 103/109] libnm: allow using _LOGx() macros in libnm --- libnm/nm-libnm-utils.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libnm/nm-libnm-utils.h b/libnm/nm-libnm-utils.h index 7f984de2a5..db6f55ec0e 100644 --- a/libnm/nm-libnm-utils.h +++ b/libnm/nm-libnm-utils.h @@ -8,6 +8,7 @@ #include "c-list/src/c-list.h" #include "nm-glib-aux/nm-ref-string.h" +#include "nm-glib-aux/nm-logging-fwd.h" #include "nm-types.h" #include "nm-object.h" #include "nm-client.h" @@ -60,6 +61,18 @@ typedef enum { | NML_DBUS_LOG_LEVEL_WARN, } NMLDBusLogLevel; +#undef _LOGL_TRACE +#undef _LOGL_DEBUG +#undef _LOGL_INFO +#undef _LOGL_WARN +#undef _LOGL_ERR + +#define _LOGL_TRACE NML_DBUS_LOG_LEVEL_TRACE +#define _LOGL_DEBUG NML_DBUS_LOG_LEVEL_DEBUG +#define _LOGL_INFO NML_DBUS_LOG_LEVEL_INFO +#define _LOGL_WARN NML_DBUS_LOG_LEVEL_WARN +#define _LOGL_ERR NML_DBUS_LOG_LEVEL_ERR + extern volatile int _nml_dbus_log_level; int _nml_dbus_log_level_init (void); From 263aa63caa7dd238026a83db4dc6b7e95693046e Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 16 Dec 2019 12:48:17 +0100 Subject: [PATCH 104/109] libnm/secret-agent: drop fallback to Register() method for secret-agent RegisterWithCapabilities() is supported since NetworkManager 0.9.9.1. Of course, we don't support such old server anymore (also, because we require the standard D-Bus interfaces like ObjectManager). --- libnm/nm-secret-agent-old.c | 97 +++++++++++-------------------------- 1 file changed, 29 insertions(+), 68 deletions(-) diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c index de9df7dc68..67623af39c 100644 --- a/libnm/nm-secret-agent-old.c +++ b/libnm/nm-secret-agent-old.c @@ -477,6 +477,7 @@ nm_secret_agent_old_register (NMSecretAgentOld *self, { NMSecretAgentOldPrivate *priv; NMSecretAgentOldClass *class; + gboolean success; g_return_val_if_fail (NM_IS_SECRET_AGENT_OLD (self), FALSE); @@ -506,97 +507,57 @@ nm_secret_agent_old_register (NMSecretAgentOld *self, return FALSE; priv->registering = TRUE; - if (nmdbus_agent_manager_call_register_with_capabilities_sync (priv->manager_proxy, - priv->identifier, - priv->capabilities, - cancellable, NULL)) - goto success; - - /* Might be an old NetworkManager that doesn't support capabilities; - * fall back to old Register() method instead. - */ - if (nmdbus_agent_manager_call_register_sync (priv->manager_proxy, - priv->identifier, - cancellable, error)) - goto success; - - /* Failure */ + success = nmdbus_agent_manager_call_register_with_capabilities_sync (priv->manager_proxy, + priv->identifier, + priv->capabilities, + cancellable, + error); priv->registering = FALSE; - _internal_unregister (self); - return FALSE; -success: - priv->registering = FALSE; + if (!success) { + _internal_unregister (self); + return FALSE; + } + priv->registered = TRUE; _notify (self, PROP_REGISTERED); return TRUE; } -static void -reg_result (NMSecretAgentOld *self, GSimpleAsyncResult *simple, GError *error) -{ - NMSecretAgentOldPrivate *priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self); - _nm_unused gs_unref_object GSimpleAsyncResult *simple_free = simple; - - priv->registering = FALSE; - - if (error) { - g_simple_async_result_take_error (simple, error); - g_simple_async_result_complete (simple); - - /* If registration failed we shouldn't expose ourselves on the bus */ - _internal_unregister (self); - } else { - priv->registered = TRUE; - _notify (self, PROP_REGISTERED); - - g_simple_async_result_set_op_res_gboolean (simple, TRUE); - g_simple_async_result_complete (simple); - } -} - -static void -reg_request_cb (GObject *proxy, - GAsyncResult *result, - gpointer user_data) -{ - GSimpleAsyncResult *simple = user_data; - NMSecretAgentOld *self; - GError *error = NULL; - - self = NM_SECRET_AGENT_OLD (g_async_result_get_source_object (G_ASYNC_RESULT (simple))); - g_object_unref (self); /* drop extra ref added by get_source_object() */ - - if (!nmdbus_agent_manager_call_register_finish (NMDBUS_AGENT_MANAGER (proxy), result, &error)) - g_dbus_error_strip_remote_error (error); - reg_result (self, simple, error); -} - static void reg_with_caps_cb (GObject *proxy, GAsyncResult *result, gpointer user_data) { - GSimpleAsyncResult *simple = user_data; + _nm_unused gs_unref_object GSimpleAsyncResult *simple = user_data; NMSecretAgentOld *self; NMSecretAgentOldPrivate *priv; + gs_free_error GError *error = NULL; self = NM_SECRET_AGENT_OLD (g_async_result_get_source_object (G_ASYNC_RESULT (simple))); g_object_unref (self); /* drop extra ref added by get_source_object() */ priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self); - if (nmdbus_agent_manager_call_register_with_capabilities_finish (NMDBUS_AGENT_MANAGER (proxy), result, NULL)) { - reg_result (self, simple, NULL); + if (!nmdbus_agent_manager_call_register_with_capabilities_finish (NMDBUS_AGENT_MANAGER (proxy), result, &error)) + g_dbus_error_strip_remote_error (error); + + priv->registering = FALSE; + + if (error) { + g_simple_async_result_take_error (simple, g_steal_pointer (&error)); + g_simple_async_result_complete (simple); + + /* If registration failed we shouldn't expose ourselves on the bus */ + _internal_unregister (self); return; } - /* Might be an old NetworkManager that doesn't support capabilities; - * fall back to old Register() method instead. - */ - nmdbus_agent_manager_call_register (priv->manager_proxy, - priv->identifier, - NULL, reg_request_cb, simple); + priv->registered = TRUE; + _notify (self, PROP_REGISTERED); + + g_simple_async_result_set_op_res_gboolean (simple, TRUE); + g_simple_async_result_complete (simple); } /** From 392befb5fdc2bc3830258d0f1bf817ac1b874af9 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 16 Dec 2019 14:16:56 +0100 Subject: [PATCH 105/109] libnm/secret-agent: support debug logging from secret-agent --- libnm/nm-secret-agent-old.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c index 67623af39c..73e78febdb 100644 --- a/libnm/nm-secret-agent-old.c +++ b/libnm/nm-secret-agent-old.c @@ -64,6 +64,14 @@ G_DEFINE_ABSTRACT_TYPE_WITH_CODE (NMSecretAgentOld, nm_secret_agent_old, G_TYPE_ /*****************************************************************************/ +#define _NMLOG(level, ...) \ + NML_DBUS_LOG((level), \ + "secret-agent["NM_HASH_OBFUSCATE_PTR_FMT"]: " _NM_UTILS_MACRO_FIRST (__VA_ARGS__), \ + NM_HASH_OBFUSCATE_PTR (self) \ + _NM_UTILS_MACRO_REST (__VA_ARGS__)) + +/*****************************************************************************/ + static void _internal_unregister (NMSecretAgentOld *self) { @@ -111,6 +119,9 @@ name_owner_changed (GObject *proxy, GetSecretsInfo *info; owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (proxy)); + + _LOGT ("name owner changed: %s%s%s", NM_PRINT_FMT_QUOTE_STRING (owner)); + if (owner) { if (should_auto_register (self)) nm_secret_agent_old_register_async (self, NULL, NULL, NULL); @@ -1073,6 +1084,8 @@ nm_secret_agent_old_init (NMSecretAgentOld *self) { NMSecretAgentOldPrivate *priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self); + _LOGT ("create new instance"); + c_list_init (&priv->gsi_lst_head); priv->dbus_secret_agent = nmdbus_secret_agent_skeleton_new (); _nm_dbus_bind_properties (self, priv->dbus_secret_agent); @@ -1090,6 +1103,8 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error) NMSecretAgentOld *self = NM_SECRET_AGENT_OLD (initable); NMSecretAgentOldPrivate *priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self); + _LOGT ("init-sync"); + priv->bus = g_bus_get_sync (_nm_dbus_bus_type (), cancellable, error); if (!priv->bus) return FALSE; @@ -1117,9 +1132,12 @@ init_async (GAsyncInitable *initable, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data) { + NMSecretAgentOld *self = NM_SECRET_AGENT_OLD (initable); GTask *task; - task = g_task_new (initable, cancellable, callback, user_data); + _LOGT ("init-async starting..."); + + task = g_task_new (self, cancellable, callback, user_data); g_task_set_priority (task, io_priority); g_bus_get (_nm_dbus_bus_type (), @@ -1135,6 +1153,8 @@ dispose (GObject *object) NMSecretAgentOldPrivate *priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self); GetSecretsInfo *info; + _LOGT ("disposing"); + if (priv->registered) { priv->registered = FALSE; nm_secret_agent_old_unregister_async (self, NULL, NULL, NULL); From cff4e937ac48282c7d05a713132aa4e349f402b9 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 16 Dec 2019 16:06:18 +0100 Subject: [PATCH 106/109] libnm/secret-agent: use GTask for nm_secret_agent_old_register*() This change is of course right and read nicer. Also, the GTask captures the current g_main_context_get_thread_default(). We will need that next. --- libnm/nm-secret-agent-old.c | 86 +++++++++++++------------------------ 1 file changed, 31 insertions(+), 55 deletions(-) diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c index 73e78febdb..91de7716bf 100644 --- a/libnm/nm-secret-agent-old.c +++ b/libnm/nm-secret-agent-old.c @@ -540,35 +540,27 @@ reg_with_caps_cb (GObject *proxy, GAsyncResult *result, gpointer user_data) { - _nm_unused gs_unref_object GSimpleAsyncResult *simple = user_data; - NMSecretAgentOld *self; - NMSecretAgentOldPrivate *priv; + gs_unref_object GTask *task = user_data; + NMSecretAgentOld *self = g_task_get_source_object (task); + NMSecretAgentOldPrivate *priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self); gs_free_error GError *error = NULL; - self = NM_SECRET_AGENT_OLD (g_async_result_get_source_object (G_ASYNC_RESULT (simple))); - g_object_unref (self); /* drop extra ref added by get_source_object() */ - - priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self); - if (!nmdbus_agent_manager_call_register_with_capabilities_finish (NMDBUS_AGENT_MANAGER (proxy), result, &error)) g_dbus_error_strip_remote_error (error); priv->registering = FALSE; if (error) { - g_simple_async_result_take_error (simple, g_steal_pointer (&error)); - g_simple_async_result_complete (simple); - /* If registration failed we shouldn't expose ourselves on the bus */ _internal_unregister (self); + g_task_return_error (task, g_steal_pointer (&error)); return; } priv->registered = TRUE; _notify (self, PROP_REGISTERED); - g_simple_async_result_set_op_res_gboolean (simple, TRUE); - g_simple_async_result_complete (simple); + g_task_return_boolean (task, TRUE); } /** @@ -593,8 +585,8 @@ nm_secret_agent_old_register_async (NMSecretAgentOld *self, { NMSecretAgentOldPrivate *priv; NMSecretAgentOldClass *class; - gs_unref_object GSimpleAsyncResult *simple = NULL; - GError *error = NULL; + gs_unref_object GTask *task = NULL; + gs_free_error GError *error = NULL; g_return_if_fail (NM_IS_SECRET_AGENT_OLD (self)); @@ -611,14 +603,10 @@ nm_secret_agent_old_register_async (NMSecretAgentOld *self, g_return_if_fail (class->save_secrets != NULL); g_return_if_fail (class->delete_secrets != NULL); - simple = g_simple_async_result_new (G_OBJECT (self), callback, user_data, - nm_secret_agent_old_register_async); - if (cancellable) - g_simple_async_result_set_check_cancellable (simple, cancellable); + task = nm_g_task_new (self, cancellable, nm_secret_agent_old_register_async, callback, user_data); if (!check_nm_running (self, &error)) { - g_simple_async_result_take_error (simple, error); - g_simple_async_result_complete_in_idle (simple); + g_task_return_error (task, g_steal_pointer (&error)); return; } @@ -627,8 +615,7 @@ nm_secret_agent_old_register_async (NMSecretAgentOld *self, priv->bus, NM_DBUS_PATH_SECRET_AGENT, &error)) { - g_simple_async_result_take_error (simple, error); - g_simple_async_result_complete_in_idle (simple); + g_task_return_error (task, g_steal_pointer (&error)); return; } @@ -640,7 +627,7 @@ nm_secret_agent_old_register_async (NMSecretAgentOld *self, priv->capabilities, NULL, reg_with_caps_cb, - g_steal_pointer (&simple)); + g_steal_pointer (&task)); } /** @@ -658,12 +645,10 @@ nm_secret_agent_old_register_finish (NMSecretAgentOld *self, GAsyncResult *result, GError **error) { - g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (self), nm_secret_agent_old_register_async), FALSE); + g_return_val_if_fail (NM_IS_SECRET_AGENT_OLD (self), FALSE); + g_return_val_if_fail (nm_g_task_is_valid (result, self, nm_secret_agent_old_register_async), FALSE); - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return FALSE; - else - return TRUE; + return g_task_propagate_boolean (G_TASK (result), error); } /** @@ -706,24 +691,21 @@ nm_secret_agent_old_unregister (NMSecretAgentOld *self, static void unregister_cb (GObject *proxy, GAsyncResult *result, gpointer user_data) { - gs_unref_object GSimpleAsyncResult *simple = user_data; - NMSecretAgentOld *self; - GError *error = NULL; - - self = NM_SECRET_AGENT_OLD (g_async_result_get_source_object (G_ASYNC_RESULT (simple))); - g_object_unref (self); /* drop extra ref added by get_source_object() */ + gs_unref_object GTask *task = user_data; + NMSecretAgentOld *self = g_task_get_source_object (task); + gs_free_error GError *error = NULL; _internal_unregister (self); - if (nmdbus_agent_manager_call_unregister_finish (NMDBUS_AGENT_MANAGER (proxy), - result, &error)) - g_simple_async_result_set_op_res_gboolean (simple, TRUE); - else { + if (!nmdbus_agent_manager_call_unregister_finish (NMDBUS_AGENT_MANAGER (proxy), + result, + &error)) { g_dbus_error_strip_remote_error (error); - g_simple_async_result_take_error (simple, error); + g_task_return_error (task, g_steal_pointer (&error)); + return; } - g_simple_async_result_complete (simple); + g_task_return_boolean (task, TRUE); } /** @@ -744,8 +726,8 @@ nm_secret_agent_old_unregister_async (NMSecretAgentOld *self, gpointer user_data) { NMSecretAgentOldPrivate *priv; - gs_unref_object GSimpleAsyncResult *simple = NULL; - GError *error = NULL; + gs_unref_object GTask *task = NULL; + gs_free_error GError *error = NULL; g_return_if_fail (NM_IS_SECRET_AGENT_OLD (self)); @@ -754,14 +736,10 @@ nm_secret_agent_old_unregister_async (NMSecretAgentOld *self, g_return_if_fail (priv->bus != NULL); g_return_if_fail (priv->manager_proxy != NULL); - simple = g_simple_async_result_new (G_OBJECT (self), callback, user_data, - nm_secret_agent_old_unregister_async); - if (cancellable) - g_simple_async_result_set_check_cancellable (simple, cancellable); + task = nm_g_task_new (self, cancellable, nm_secret_agent_old_unregister_async, callback, user_data); if (!check_nm_running (self, &error)) { - g_simple_async_result_take_error (simple, error); - g_simple_async_result_complete_in_idle (simple); + g_task_return_error (task, g_steal_pointer (&error)); return; } @@ -770,7 +748,7 @@ nm_secret_agent_old_unregister_async (NMSecretAgentOld *self, nmdbus_agent_manager_call_unregister (priv->manager_proxy, cancellable, unregister_cb, - g_steal_pointer (&simple)); + g_steal_pointer (&task)); } /** @@ -788,12 +766,10 @@ nm_secret_agent_old_unregister_finish (NMSecretAgentOld *self, GAsyncResult *result, GError **error) { - g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (self), nm_secret_agent_old_unregister_async), FALSE); + g_return_val_if_fail (NM_IS_SECRET_AGENT_OLD (self), FALSE); + g_return_val_if_fail (nm_g_task_is_valid (result, self, nm_secret_agent_old_unregister_async), FALSE); - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return FALSE; - else - return TRUE; + return g_task_propagate_boolean (G_TASK (result), error); } /** From f0d3243f2ba973bc83687c28d8e7fab4b0104650 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 16 Dec 2019 16:57:01 +0100 Subject: [PATCH 107/109] libnm/secret-agent: fix race registering secret agent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When NetworkManager starts, NMSecretAgentOld gets a name-owner changed signal and registers right away. Especially since commit ce0e898fb476 ('libnm: refactor caching of D-Bus objects in NMClient') this hits a race where NetworkManager does not yet export the org.freedesktop.NetworkManager.AgentManager interface and the registration fails: GDBus.Error:org.freedesktop.DBus.Error.UnknownMethod: No such interface “org.freedesktop.NetworkManager.AgentManager” on object at path /org/freedesktop/NetworkManager/AgentManager Previously, when NMClient recevied a name-owner changed, that would block the main loop long enough to avoid the race. Note that NMClient has nothing to do with NMSecretAgentOld, however in practice all applications that use NMSecretAgentOld also use NMClient. While we should fix the race server-side, we also need to work around it in the client. Retry. Also, make the async request actually cancellable and actually honor the passed GCancellable. Check output: $ LIBNM_CLIENT_DEBUG=trace ./clients/cli/nmcli agent secret |& grep secret-agent libnm-dbus: [21399.04862] secret-agent[2f2af4ee102d7570]: create new instance libnm-dbus: [21399.04863] secret-agent[2f2af4ee102d7570]: init-sync libnm-dbus: [21404.08147] secret-agent[2f2af4ee102d7570]: name owner changed: (null) libnm-dbus: [21404.09085] secret-agent[2f2af4ee102d7570]: name owner changed: ":1.2504" libnm-dbus: [21404.09085] secret-agent[2f2af4ee102d7570]: register: starting asynchronous registration... libnm-dbus: [21404.09178] secret-agent[2f2af4ee102d7570]: register: registration failed with error "GDBus.Error:org.freedesktop.DBus.Error.UnknownMethod: No such interface “org.freedesktop.NetworkManager.AgentManager” on object at path /org/freedesktop/NetworkManager/AgentManager". Retry in 0 msec... libnm-dbus: [21404.09178] secret-agent[2f2af4ee102d7570]: register: retry registration... libnm-dbus: [21404.09195] secret-agent[2f2af4ee102d7570]: register: registration failed with error "GDBus.Error:org.freedesktop.DBus.Error.UnknownMethod: No such interface “org.freedesktop.NetworkManager.AgentManager” on object at path /org/freedesktop/NetworkManager/AgentManager". Retry in 4 msec... libnm-dbus: [21404.09236] secret-agent[2f2af4ee102d7570]: register: retry registration... [...] libnm-dbus: [21405.01782] secret-agent[2f2af4ee102d7570]: register: registration failed with error "GDBus.Error:org.freedesktop.DBus.Error.UnknownMethod: No such interface “org.freedesktop.NetworkManager.AgentManager” on object at path /org/freedesktop/NetworkManager/AgentManager". Retry in 128 msec... libnm-dbus: [21405.03063] secret-agent[2f2af4ee102d7570]: register: retry registration... libnm-dbus: [21405.03068] secret-agent[2f2af4ee102d7570]: register: registration failed with error "GDBus.Error:org.freedesktop.DBus.Error.UnknownMethod: No such interface “org.freedesktop.NetworkManager.AgentManager” on object at path /org/freedesktop/NetworkManager/AgentManager". Retry in 128 msec... libnm-dbus: [21405.04354] secret-agent[2f2af4ee102d7570]: register: retry registration... libnm-dbus: [21406.01097] secret-agent[2f2af4ee102d7570]: register: registration succeeded --- libnm/nm-secret-agent-old.c | 225 +++++++++++++++++++++++++++++++----- 1 file changed, 193 insertions(+), 32 deletions(-) diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c index 91de7716bf..49d41df1ae 100644 --- a/libnm/nm-secret-agent-old.c +++ b/libnm/nm-secret-agent-old.c @@ -7,16 +7,20 @@ #include "nm-secret-agent-old.h" +#include "c-list/src/c-list.h" +#include "nm-core-internal.h" +#include "nm-dbus-helpers.h" #include "nm-dbus-interface.h" #include "nm-enum-types.h" -#include "nm-dbus-helpers.h" +#include "nm-glib-aux/nm-dbus-aux.h" +#include "nm-glib-aux/nm-time-utils.h" #include "nm-simple-connection.h" -#include "nm-core-internal.h" -#include "c-list/src/c-list.h" #include "introspection/org.freedesktop.NetworkManager.SecretAgent.h" #include "introspection/org.freedesktop.NetworkManager.AgentManager.h" +#define REGISTER_RETRY_TIMEOUT_MSEC 2000 + /*****************************************************************************/ typedef struct { @@ -45,8 +49,10 @@ typedef struct { NMSecretAgentCapabilities capabilities; + gint64 registering_timeout_msec; + guint registering_try_count; + bool registered:1; - bool registering:1; bool session_bus:1; bool auto_register:1; bool suppress_auto:1; @@ -72,6 +78,12 @@ G_DEFINE_ABSTRACT_TYPE_WITH_CODE (NMSecretAgentOld, nm_secret_agent_old, G_TYPE_ /*****************************************************************************/ +static void _register_call_cb (GObject *proxy, + GAsyncResult *result, + gpointer user_data); + +/*****************************************************************************/ + static void _internal_unregister (NMSecretAgentOld *self) { @@ -80,7 +92,7 @@ _internal_unregister (NMSecretAgentOld *self) if (priv->registered) { g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (priv->dbus_secret_agent)); priv->registered = FALSE; - priv->registering = FALSE; + priv->registering_timeout_msec = 0; _notify (self, PROP_REGISTERED); } } @@ -105,7 +117,7 @@ should_auto_register (NMSecretAgentOld *self) return ( priv->auto_register && !priv->suppress_auto && !priv->registered - && !priv->registering); + && priv->registering_timeout_msec == 0); } static void @@ -466,6 +478,23 @@ check_nm_running (NMSecretAgentOld *self, GError **error) /*****************************************************************************/ +static gboolean +_register_should_retry (NMSecretAgentOldPrivate *priv, + guint *out_timeout_msec) +{ + guint timeout_msec; + + if (priv->registering_try_count++ == 0) + timeout_msec = 0; + else if (nm_utils_get_monotonic_timestamp_msec () < priv->registering_timeout_msec) + timeout_msec = 1ULL * (1ULL << NM_MIN (7, priv->registering_try_count)); + else + return FALSE; + + *out_timeout_msec = timeout_msec; + return TRUE; +} + /** * nm_secret_agent_old_register: * @self: a #NMSecretAgentOld @@ -488,14 +517,13 @@ nm_secret_agent_old_register (NMSecretAgentOld *self, { NMSecretAgentOldPrivate *priv; NMSecretAgentOldClass *class; - gboolean success; g_return_val_if_fail (NM_IS_SECRET_AGENT_OLD (self), FALSE); priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self); g_return_val_if_fail (priv->registered == FALSE, FALSE); - g_return_val_if_fail (priv->registering == FALSE, FALSE); + g_return_val_if_fail (priv->registering_timeout_msec == 0, FALSE); g_return_val_if_fail (priv->bus != NULL, FALSE); g_return_val_if_fail (priv->manager_proxy != NULL, FALSE); @@ -517,46 +545,175 @@ nm_secret_agent_old_register (NMSecretAgentOld *self, error)) return FALSE; - priv->registering = TRUE; - success = nmdbus_agent_manager_call_register_with_capabilities_sync (priv->manager_proxy, - priv->identifier, - priv->capabilities, - cancellable, - error); - priv->registering = FALSE; + priv->registering_timeout_msec = nm_utils_get_monotonic_timestamp_msec () + REGISTER_RETRY_TIMEOUT_MSEC; + priv->registering_try_count = 0; - if (!success) { - _internal_unregister (self); - return FALSE; + while (TRUE) { + gs_free_error GError *local = NULL; + gs_free char *dbus_error = NULL; + + nmdbus_agent_manager_call_register_with_capabilities_sync (priv->manager_proxy, + priv->identifier, + priv->capabilities, + cancellable, + &local); + if (nm_dbus_error_is (local, NM_DBUS_ERROR_NAME_UNKNOWN_METHOD)) { + guint timeout_msec; + + if (_register_should_retry (priv, &timeout_msec)) { + if (timeout_msec > 0) + g_usleep (timeout_msec * 1000LU); + continue; + } + } + + priv->registering_timeout_msec = 0; + + if (local) { + g_dbus_error_strip_remote_error (local); + g_propagate_error (error, g_steal_pointer (&local)); + _internal_unregister (self); + return FALSE; + } + + priv->registered = TRUE; + _notify (self, PROP_REGISTERED); + return TRUE; } +} - priv->registered = TRUE; - _notify (self, PROP_REGISTERED); - return TRUE; +/*****************************************************************************/ + +typedef struct { + GCancellable *cancellable; + GSource *timeout_source; + gulong cancellable_signal_id; +} RegisterData; + +static void +_register_data_free (RegisterData *register_data) +{ + nm_clear_g_cancellable_disconnect (register_data->cancellable, ®ister_data->cancellable_signal_id); + nm_clear_g_source_inst (®ister_data->timeout_source); + g_clear_object (®ister_data->cancellable); + nm_g_slice_free (register_data); +} + +static gboolean +_register_retry_cb (gpointer user_data) +{ + gs_unref_object GTask *task = user_data; + NMSecretAgentOld *self = g_task_get_source_object (task); + NMSecretAgentOldPrivate *priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self); + GCancellable *cancellable; + + _LOGT ("register: retry registration..."); + + g_task_set_task_data (task, NULL, NULL); + + cancellable = g_task_get_cancellable (task); + + nmdbus_agent_manager_call_register_with_capabilities (priv->manager_proxy, + priv->identifier, + priv->capabilities, + cancellable, + _register_call_cb, + g_steal_pointer (&task)); + return G_SOURCE_REMOVE; } static void -reg_with_caps_cb (GObject *proxy, - GAsyncResult *result, - gpointer user_data) +_register_cancelled_cb (GCancellable *cancellable, + gpointer user_data) +{ + gs_unref_object GTask *task = user_data; + NMSecretAgentOld *self = g_task_get_source_object (task); + RegisterData *register_data = g_task_get_task_data (task); + GError *error = NULL; + + nm_clear_g_signal_handler (register_data->cancellable, ®ister_data->cancellable_signal_id); + g_task_set_task_data (task, NULL, NULL); + + _LOGT ("register: registration cancelled. Stop waiting..."); + + nm_utils_error_set_cancelled (&error, FALSE, NULL); + g_task_return_error (task, error); +} + +static void +_register_call_cb (GObject *proxy, + GAsyncResult *result, + gpointer user_data) { gs_unref_object GTask *task = user_data; NMSecretAgentOld *self = g_task_get_source_object (task); NMSecretAgentOldPrivate *priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self); gs_free_error GError *error = NULL; - if (!nmdbus_agent_manager_call_register_with_capabilities_finish (NMDBUS_AGENT_MANAGER (proxy), result, &error)) - g_dbus_error_strip_remote_error (error); + nmdbus_agent_manager_call_register_with_capabilities_finish (NMDBUS_AGENT_MANAGER (proxy), result, &error); - priv->registering = FALSE; + if (nm_utils_error_is_cancelled (error, FALSE)) { + /* FIXME: we should unregister right away. For now, don't do that, likely the + * application is anyway about to exit. */ + } else if (nm_dbus_error_is (error, NM_DBUS_ERROR_NAME_UNKNOWN_METHOD)) { + gboolean already_cancelled = FALSE; + RegisterData *register_data; + guint timeout_msec; + + if (!_register_should_retry (priv, &timeout_msec)) + goto done; + + _LOGT ("register: registration failed with error \"%s\". Retry in %u msec...", error->message, timeout_msec); + nm_assert (G_IS_TASK (task)); + nm_assert (!g_task_get_task_data (task)); + + register_data = g_slice_new (RegisterData); + + *register_data = (RegisterData) { + .cancellable = nm_g_object_ref (g_task_get_cancellable (task)), + }; + + g_task_set_task_data (task, + register_data, + (GDestroyNotify) _register_data_free); + + if (register_data->cancellable) { + register_data->cancellable_signal_id = g_cancellable_connect (register_data->cancellable, + G_CALLBACK (_register_cancelled_cb), + task, + NULL); + if (register_data->cancellable_signal_id == 0) + already_cancelled = TRUE; + } + + if (!already_cancelled) { + register_data->timeout_source = nm_g_source_attach (nm_g_timeout_source_new (timeout_msec, + g_task_get_priority (task), + _register_retry_cb, + task, + NULL), + g_task_get_context (task)); + } + + /* The reference of the task is owned by the _register_cancelled_cb and _register_retry_cb actions. + * Whichever completes first, will consume it. */ + g_steal_pointer (&task); + return; + } + +done: + priv->registering_timeout_msec = nm_utils_get_monotonic_timestamp_msec () + REGISTER_RETRY_TIMEOUT_MSEC; + priv->registering_try_count = 0; if (error) { - /* If registration failed we shouldn't expose ourselves on the bus */ + _LOGT ("register: registration failed with error \"%s\"", error->message); + g_dbus_error_strip_remote_error (error); _internal_unregister (self); g_task_return_error (task, g_steal_pointer (&error)); return; } + _LOGT ("register: registration succeeded"); priv->registered = TRUE; _notify (self, PROP_REGISTERED); @@ -593,7 +750,7 @@ nm_secret_agent_old_register_async (NMSecretAgentOld *self, priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self); g_return_if_fail (priv->registered == FALSE); - g_return_if_fail (priv->registering == FALSE); + g_return_if_fail (priv->registering_timeout_msec == 0); g_return_if_fail (priv->bus != NULL); g_return_if_fail (priv->manager_proxy != NULL); @@ -606,6 +763,7 @@ nm_secret_agent_old_register_async (NMSecretAgentOld *self, task = nm_g_task_new (self, cancellable, nm_secret_agent_old_register_async, callback, user_data); if (!check_nm_running (self, &error)) { + _LOGT ("register: failed because NetworkManager is not running"); g_task_return_error (task, g_steal_pointer (&error)); return; } @@ -615,18 +773,21 @@ nm_secret_agent_old_register_async (NMSecretAgentOld *self, priv->bus, NM_DBUS_PATH_SECRET_AGENT, &error)) { + _LOGT ("register: failed to export D-Bus service: %s", error->message); g_task_return_error (task, g_steal_pointer (&error)); return; } priv->suppress_auto = FALSE; - priv->registering = TRUE; + priv->registering_timeout_msec = nm_utils_get_monotonic_timestamp_msec () + REGISTER_RETRY_TIMEOUT_MSEC; + priv->registering_try_count = 0; + _LOGT ("register: starting asynchronous registration..."); nmdbus_agent_manager_call_register_with_capabilities (priv->manager_proxy, priv->identifier, priv->capabilities, - NULL, - reg_with_caps_cb, + cancellable, + _register_call_cb, g_steal_pointer (&task)); } From 1f9dabcb735b3b9f0511cf72d1ed23e540ca49ee Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 16 Dec 2019 18:53:04 +0100 Subject: [PATCH 108/109] libnm/secret-agent: fix reseting timeout when registration completes Fixes: f0d3243f2ba9 ('libnm/secret-agent: fix race registering secret agent') --- libnm/nm-secret-agent-old.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c index 49d41df1ae..1203fb11bc 100644 --- a/libnm/nm-secret-agent-old.c +++ b/libnm/nm-secret-agent-old.c @@ -702,8 +702,7 @@ _register_call_cb (GObject *proxy, } done: - priv->registering_timeout_msec = nm_utils_get_monotonic_timestamp_msec () + REGISTER_RETRY_TIMEOUT_MSEC; - priv->registering_try_count = 0; + priv->registering_timeout_msec = 0; if (error) { _LOGT ("register: registration failed with error \"%s\"", error->message); From 5f9bcc91c79c67073c62cf4edebddac56d9a1dc1 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 17 Dec 2019 08:57:03 +0100 Subject: [PATCH 109/109] libnm/secret-agent: remove unused variable Fixes: f0d3243f2ba9 ('libnm/secret-agent: fix race registering secret agent') --- libnm/nm-secret-agent-old.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c index 1203fb11bc..03aa87140f 100644 --- a/libnm/nm-secret-agent-old.c +++ b/libnm/nm-secret-agent-old.c @@ -550,7 +550,6 @@ nm_secret_agent_old_register (NMSecretAgentOld *self, while (TRUE) { gs_free_error GError *local = NULL; - gs_free char *dbus_error = NULL; nmdbus_agent_manager_call_register_with_capabilities_sync (priv->manager_proxy, priv->identifier,