From 295e6678ddb02b2d183f2b3f70d91eb6e65625ad Mon Sep 17 00:00:00 2001 From: Eliot Lear Date: Wed, 8 Apr 2020 07:30:08 +0000 Subject: dhcp: add support for MUD URL (RFC 8520) [thaller@redhat.com: rewritten commit message] https://tools.ietf.org/html/rfc8520 https://blog.apnic.net/2019/05/14/protecting-the-internet-of-things-with-mud/ https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/402 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/463 --- clients/common/nm-meta-setting-desc.c | 3 + clients/common/settings-docs.h.in | 1 + .../test-client.check-on-disk/test_002.expected | 10 +- .../test-client.check-on-disk/test_003.expected | 482 ++++++++------- .../test-client.check-on-disk/test_004.expected | 678 ++++++++++++--------- libnm-core/nm-setting-connection.c | 57 ++ libnm-core/nm-setting-connection.h | 3 + libnm-core/tests/test-general.c | 1 + libnm/libnm.ver | 1 + src/devices/nm-device.c | 10 +- src/dhcp/nm-dhcp-client.c | 23 + src/dhcp/nm-dhcp-client.h | 2 + src/dhcp/nm-dhcp-dhclient-utils.c | 26 +- src/dhcp/nm-dhcp-dhclient-utils.h | 1 + src/dhcp/nm-dhcp-dhclient.c | 6 + src/dhcp/nm-dhcp-manager.c | 6 + src/dhcp/nm-dhcp-manager.h | 2 + src/dhcp/nm-dhcp-nettools.c | 10 + src/dhcp/nm-dhcp-options.c | 3 +- src/dhcp/nm-dhcp-options.h | 2 + src/dhcp/nm-dhcp-systemd.c | 11 + src/dhcp/tests/test-dhcp-dhclient.c | 59 +- src/nm-iface-helper.c | 2 + .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 6 + src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c | 1 + src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h | 3 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 5 +- 27 files changed, 890 insertions(+), 524 deletions(-) diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index 920a5af949..b7aacd7907 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -5227,6 +5227,9 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = { ), ), ), + PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_MUD_URL, + .property_type = &_pt_gobject_string, + ), PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT, .property_type = &_pt_gobject_int, ), diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in index ca70e80d08..8415b82c5a 100644 --- a/clients/common/settings-docs.h.in +++ b/clients/common/settings-docs.h.in @@ -152,6 +152,7 @@ #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\" (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_MUD_URL N_("If configured, set to a Manufacturer Usage Description (MUD) URL that points to manufacturer-recommended network policies for IoT devices. It is transmitted as a DHCPv4 or DHCPv6 option.") #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.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_READ_ONLY N_("FALSE if the connection can be modified using the provided settings service's D-Bus interface with the right privileges, or TRUE if the connection is read-only and cannot be modified.") diff --git a/clients/tests/test-client.check-on-disk/test_002.expected b/clients/tests/test-client.check-on-disk/test_002.expected index 1c6eecc59b..1b40086ec8 100644 --- a/clients/tests/test-client.check-on-disk/test_002.expected +++ b/clients/tests/test-client.check-on-disk/test_002.expected @@ -502,12 +502,12 @@ NAME UUID TYPE DEVICE con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- <<< -size: 1263 +size: 1306 location: clients/tests/test-client.py:test_002()/23 cmd: $NMCLI c s con-1 lang: C returncode: 0 -stdout: 1138 bytes +stdout: 1181 bytes >>> connection.id: con-1 connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d @@ -532,15 +532,16 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 <<< -size: 1275 +size: 1318 location: clients/tests/test-client.py:test_002()/24 cmd: $NMCLI c s con-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1140 bytes +stdout: 1183 bytes >>> connection.id: con-1 connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d @@ -565,6 +566,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 <<< 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 9517e81fe1..2b8f720f56 100644 --- a/clients/tests/test-client.check-on-disk/test_003.expected +++ b/clients/tests/test-client.check-on-disk/test_003.expected @@ -150,12 +150,12 @@ id path uuid <<< -size: 4447 +size: 4490 location: clients/tests/test-client.py:test_003()/12 cmd: $NMCLI con s con-gsm1 lang: C returncode: 0 -stdout: 4317 bytes +stdout: 4360 bytes >>> connection.id: con-gsm1 connection.uuid: UUID-con-gsm1-REPLACED-REPLACED-REPL @@ -180,6 +180,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -254,12 +255,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 4477 +size: 4520 location: clients/tests/test-client.py:test_003()/13 cmd: $NMCLI con s con-gsm1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4337 bytes +stdout: 4380 bytes >>> connection.id: con-gsm1 connection.uuid: UUID-con-gsm1-REPLACED-REPLACED-REPL @@ -284,6 +285,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -490,12 +492,12 @@ UUID NAME UUID-ethernet-REPLACED-REPLACED-REPL ethernet <<< -size: 4222 +size: 4265 location: clients/tests/test-client.py:test_003()/25 cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 -stdout: 4085 bytes +stdout: 4128 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -520,6 +522,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -589,12 +592,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 4250 +size: 4293 location: clients/tests/test-client.py:test_003()/26 cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 4103 bytes +stdout: 4146 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -619,6 +622,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -708,12 +712,12 @@ stdout: 51 bytes GENERAL.STATE: aktywowano <<< -size: 4922 +size: 4965 location: clients/tests/test-client.py:test_003()/29 cmd: $NMCLI con s ethernet lang: C returncode: 0 -stdout: 4792 bytes +stdout: 4835 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -738,6 +742,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -820,12 +825,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 4954 +size: 4997 location: clients/tests/test-client.py:test_003()/30 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 4814 bytes +stdout: 4857 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -850,6 +855,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -1402,12 +1408,12 @@ UUID NAME UUID-ethernet-REPLACED-REPLACED-REPL ethernet <<< -size: 4222 +size: 4265 location: clients/tests/test-client.py:test_003()/50 cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 -stdout: 4085 bytes +stdout: 4128 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -1432,6 +1438,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -1501,12 +1508,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 4250 +size: 4293 location: clients/tests/test-client.py:test_003()/51 cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 4103 bytes +stdout: 4146 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -1531,6 +1538,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -1624,12 +1632,12 @@ GENERAL.STATE: aktywowano GENERAL.STATE: aktywowano <<< -size: 5630 +size: 5673 location: clients/tests/test-client.py:test_003()/54 cmd: $NMCLI con s ethernet lang: C returncode: 0 -stdout: 5500 bytes +stdout: 5543 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -1654,6 +1662,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -1750,12 +1759,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 5666 +size: 5709 location: clients/tests/test-client.py:test_003()/55 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 5526 bytes +stdout: 5569 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -1780,6 +1789,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -2264,12 +2274,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL gsm UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -size: 5633 +size: 5676 location: clients/tests/test-client.py:test_003()/68 cmd: $NMCLI con s ethernet lang: C returncode: 0 -stdout: 5503 bytes +stdout: 5546 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -2294,6 +2304,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -2390,12 +2401,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 5670 +size: 5713 location: clients/tests/test-client.py:test_003()/69 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 5530 bytes +stdout: 5573 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -2420,6 +2431,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -2516,12 +2528,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 4965 +size: 5008 location: clients/tests/test-client.py:test_003()/70 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 4795 bytes +stdout: 4838 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -2546,6 +2558,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -2628,12 +2641,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 4998 +size: 5041 location: clients/tests/test-client.py:test_003()/71 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4818 bytes +stdout: 4861 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -2658,6 +2671,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -2938,12 +2952,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL gsm UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -size: 5645 +size: 5688 location: clients/tests/test-client.py:test_003()/78 cmd: $NMCLI --color yes con s ethernet lang: C returncode: 0 -stdout: 5503 bytes +stdout: 5546 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -2968,6 +2982,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -3064,12 +3079,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 5682 +size: 5725 location: clients/tests/test-client.py:test_003()/79 cmd: $NMCLI --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 5530 bytes +stdout: 5573 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -3094,6 +3109,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -3190,12 +3206,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 4977 +size: 5020 location: clients/tests/test-client.py:test_003()/80 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 4795 bytes +stdout: 4838 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -3220,6 +3236,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -3302,12 +3319,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 5010 +size: 5053 location: clients/tests/test-client.py:test_003()/81 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4818 bytes +stdout: 4861 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -3332,6 +3349,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -3628,12 +3646,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL gsm UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -size: 6887 +size: 6930 location: clients/tests/test-client.py:test_003()/88 cmd: $NMCLI --pretty con s ethernet lang: C returncode: 0 -stdout: 6748 bytes +stdout: 6791 bytes >>> =============================================================================== Connection profile details (ethernet) @@ -3661,6 +3679,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- 802-3-ethernet.port: -- @@ -3770,12 +3789,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 6943 +size: 6986 location: clients/tests/test-client.py:test_003()/89 cmd: $NMCLI --pretty con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 6794 bytes +stdout: 6837 bytes >>> =============================================================================== Szczegóły profilu połączenia (ethernet) @@ -3803,6 +3822,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- 802-3-ethernet.port: -- @@ -3912,12 +3932,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 5906 +size: 5949 location: clients/tests/test-client.py:test_003()/90 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 5727 bytes +stdout: 5770 bytes >>> =============================================================================== Connection profile details (ethernet) @@ -3945,6 +3965,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- 802-3-ethernet.port: -- @@ -4036,12 +4057,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 5951 +size: 5994 location: clients/tests/test-client.py:test_003()/91 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5762 bytes +stdout: 5805 bytes >>> =============================================================================== Szczegóły profilu połączenia (ethernet) @@ -4069,6 +4090,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- 802-3-ethernet.port: -- @@ -4398,12 +4420,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL gsm UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -size: 6899 +size: 6942 location: clients/tests/test-client.py:test_003()/98 cmd: $NMCLI --pretty --color yes con s ethernet lang: C returncode: 0 -stdout: 6748 bytes +stdout: 6791 bytes >>> =============================================================================== Connection profile details (ethernet) @@ -4431,6 +4453,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- 802-3-ethernet.port: -- @@ -4540,12 +4563,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 6955 +size: 6998 location: clients/tests/test-client.py:test_003()/99 cmd: $NMCLI --pretty --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 6794 bytes +stdout: 6837 bytes >>> =============================================================================== Szczegóły profilu połączenia (ethernet) @@ -4573,6 +4596,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- 802-3-ethernet.port: -- @@ -4682,12 +4706,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 5919 +size: 5962 location: clients/tests/test-client.py:test_003()/100 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 5727 bytes +stdout: 5770 bytes >>> =============================================================================== Connection profile details (ethernet) @@ -4715,6 +4739,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- 802-3-ethernet.port: -- @@ -4806,12 +4831,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 5964 +size: 6007 location: clients/tests/test-client.py:test_003()/101 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5762 bytes +stdout: 5805 bytes >>> =============================================================================== Szczegóły profilu połączenia (ethernet) @@ -4839,6 +4864,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- 802-3-ethernet.port: -- @@ -5148,12 +5174,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet <<< -size: 3001 +size: 3021 location: clients/tests/test-client.py:test_003()/108 cmd: $NMCLI --terse con s ethernet lang: C returncode: 0 -stdout: 2862 bytes +stdout: 2882 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -5178,6 +5204,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 @@ -5274,12 +5301,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 3011 +size: 3031 location: clients/tests/test-client.py:test_003()/109 cmd: $NMCLI --terse con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 2862 bytes +stdout: 2882 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -5304,6 +5331,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 @@ -5400,12 +5428,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2655 +size: 2675 location: clients/tests/test-client.py:test_003()/110 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 2476 bytes +stdout: 2496 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -5430,6 +5458,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 @@ -5512,12 +5541,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2665 +size: 2685 location: clients/tests/test-client.py:test_003()/111 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2476 bytes +stdout: 2496 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -5542,6 +5571,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 @@ -5818,12 +5848,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet <<< -size: 3013 +size: 3033 location: clients/tests/test-client.py:test_003()/118 cmd: $NMCLI --terse --color yes con s ethernet lang: C returncode: 0 -stdout: 2862 bytes +stdout: 2882 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -5848,6 +5878,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 @@ -5944,12 +5975,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 3023 +size: 3043 location: clients/tests/test-client.py:test_003()/119 cmd: $NMCLI --terse --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 2862 bytes +stdout: 2882 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -5974,6 +6005,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 @@ -6070,12 +6102,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2667 +size: 2687 location: clients/tests/test-client.py:test_003()/120 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 2476 bytes +stdout: 2496 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -6100,6 +6132,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 @@ -6182,12 +6215,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2677 +size: 2697 location: clients/tests/test-client.py:test_003()/121 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2476 bytes +stdout: 2496 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -6212,6 +6245,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 @@ -6492,15 +6526,15 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL gsm UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -size: 3736 +size: 3754 location: clients/tests/test-client.py:test_003()/128 cmd: $NMCLI --mode tabular con s ethernet lang: C returncode: 0 -stdout: 3590 bytes +stdout: 3608 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -- -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password 802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default -- @@ -6523,15 +6557,15 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deac <<< -size: 3770 +size: 3788 location: clients/tests/test-client.py:test_003()/129 cmd: $NMCLI --mode tabular con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 3614 bytes +stdout: 3632 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -- -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password 802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default -- @@ -6554,15 +6588,15 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deza <<< -size: 3274 +size: 3292 location: clients/tests/test-client.py:test_003()/130 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 3088 bytes +stdout: 3106 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -- -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password 802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default -- @@ -6581,15 +6615,15 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deac <<< -size: 3306 +size: 3324 location: clients/tests/test-client.py:test_003()/131 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3110 bytes +stdout: 3128 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -- -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password 802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default -- @@ -6736,15 +6770,15 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL gsm UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -size: 3748 +size: 3766 location: clients/tests/test-client.py:test_003()/138 cmd: $NMCLI --mode tabular --color yes con s ethernet lang: C returncode: 0 -stdout: 3590 bytes +stdout: 3608 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -- -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password 802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default -- @@ -6767,15 +6801,15 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deac <<< -size: 3782 +size: 3800 location: clients/tests/test-client.py:test_003()/139 cmd: $NMCLI --mode tabular --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 3614 bytes +stdout: 3632 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -- -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password 802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default -- @@ -6798,15 +6832,15 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deza <<< -size: 3286 +size: 3304 location: clients/tests/test-client.py:test_003()/140 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 3088 bytes +stdout: 3106 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -- -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password 802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default -- @@ -6825,15 +6859,15 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deac <<< -size: 3318 +size: 3336 location: clients/tests/test-client.py:test_003()/141 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3110 bytes +stdout: 3128 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -- -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password 802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default -- @@ -6996,19 +7030,19 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL gsm UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -size: 6089 +size: 6116 location: clients/tests/test-client.py:test_003()/148 cmd: $NMCLI --mode tabular --pretty con s ethernet lang: C returncode: 0 -stdout: 5934 bytes +stdout: 5961 bytes >>> ========================================= Connection profile details (ethernet) ========================================= -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -- -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -7043,19 +7077,19 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deac <<< -size: 6183 +size: 6210 location: clients/tests/test-client.py:test_003()/149 cmd: $NMCLI --mode tabular --pretty con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 6018 bytes +stdout: 6045 bytes >>> =========================================== Szczegóły profilu połączenia (ethernet) =========================================== -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -- -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -7090,19 +7124,19 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deza <<< -size: 5165 +size: 5192 location: clients/tests/test-client.py:test_003()/150 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 4970 bytes +stdout: 4997 bytes >>> ========================================= Connection profile details (ethernet) ========================================= -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -- -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -7129,19 +7163,19 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deac <<< -size: 5237 +size: 5264 location: clients/tests/test-client.py:test_003()/151 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5032 bytes +stdout: 5059 bytes >>> =========================================== Szczegóły profilu połączenia (ethernet) =========================================== -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -- -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -7336,19 +7370,19 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL gsm UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -size: 6101 +size: 6128 location: clients/tests/test-client.py:test_003()/158 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet lang: C returncode: 0 -stdout: 5934 bytes +stdout: 5961 bytes >>> ========================================= Connection profile details (ethernet) ========================================= -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -- -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -7383,19 +7417,19 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deac <<< -size: 6195 +size: 6222 location: clients/tests/test-client.py:test_003()/159 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 6018 bytes +stdout: 6045 bytes >>> =========================================== Szczegóły profilu połączenia (ethernet) =========================================== -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -- -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -7430,19 +7464,19 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deza <<< -size: 5177 +size: 5204 location: clients/tests/test-client.py:test_003()/160 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 4970 bytes +stdout: 4997 bytes >>> ========================================= Connection profile details (ethernet) ========================================= -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -- -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -7469,19 +7503,19 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 -- deac <<< -size: 5249 +size: 5276 location: clients/tests/test-client.py:test_003()/161 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5032 bytes +stdout: 5059 bytes >>> =========================================== Szczegóły profilu połączenia (ethernet) =========================================== -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -- -1 name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -7656,14 +7690,14 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet <<< -size: 843 +size: 844 location: clients/tests/test-client.py:test_003()/168 cmd: $NMCLI --mode tabular --terse con s ethernet lang: C returncode: 0 -stdout: 690 bytes +stdout: 691 bytes >>> -connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1 +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1 802-3-ethernet::0::no:::::auto::::default: ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0: @@ -7673,14 +7707,14 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::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: 853 +size: 854 location: clients/tests/test-client.py:test_003()/169 cmd: $NMCLI --mode tabular --terse con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 690 bytes +stdout: 691 bytes >>> -connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1 +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1 802-3-ethernet::0::no:::::auto::::default: ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0: @@ -7690,14 +7724,14 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::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: 695 +size: 696 location: clients/tests/test-client.py:test_003()/170 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 502 bytes +stdout: 503 bytes >>> -connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1 +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1 802-3-ethernet::0::no:::::auto::::default: ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0: @@ -7705,14 +7739,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: 705 +size: 706 location: clients/tests/test-client.py:test_003()/171 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 502 bytes +stdout: 503 bytes >>> -connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1 +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1 802-3-ethernet::0::no:::::auto::::default: ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0: @@ -7810,14 +7844,14 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet <<< -size: 855 +size: 856 location: clients/tests/test-client.py:test_003()/178 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet lang: C returncode: 0 -stdout: 690 bytes +stdout: 691 bytes >>> -connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1 +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1 802-3-ethernet::0::no:::::auto::::default: ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0: @@ -7827,14 +7861,14 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::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: 865 +size: 866 location: clients/tests/test-client.py:test_003()/179 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 690 bytes +stdout: 691 bytes >>> -connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1 +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1 802-3-ethernet::0::no:::::auto::::default: ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0: @@ -7844,14 +7878,14 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::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: 707 +size: 708 location: clients/tests/test-client.py:test_003()/180 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 502 bytes +stdout: 503 bytes >>> -connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1 +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1 802-3-ethernet::0::no:::::auto::::default: ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0: @@ -7859,14 +7893,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: 717 +size: 718 location: clients/tests/test-client.py:test_003()/181 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 502 bytes +stdout: 503 bytes >>> -connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1 +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1 802-3-ethernet::0::no:::::auto::::default: ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0: @@ -8112,12 +8146,12 @@ UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA TYPE: ethernet <<< -size: 5651 +size: 5694 location: clients/tests/test-client.py:test_003()/188 cmd: $NMCLI --mode multiline con s ethernet lang: C returncode: 0 -stdout: 5503 bytes +stdout: 5546 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -8142,6 +8176,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -8238,12 +8273,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 5688 +size: 5731 location: clients/tests/test-client.py:test_003()/189 cmd: $NMCLI --mode multiline con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 5530 bytes +stdout: 5573 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -8268,6 +8303,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -8364,12 +8400,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 4983 +size: 5026 location: clients/tests/test-client.py:test_003()/190 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 4795 bytes +stdout: 4838 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -8394,6 +8430,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -8476,12 +8513,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 5016 +size: 5059 location: clients/tests/test-client.py:test_003()/191 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4818 bytes +stdout: 4861 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -8506,6 +8543,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -8930,12 +8968,12 @@ UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA TYPE: ethernet <<< -size: 5663 +size: 5706 location: clients/tests/test-client.py:test_003()/198 cmd: $NMCLI --mode multiline --color yes con s ethernet lang: C returncode: 0 -stdout: 5503 bytes +stdout: 5546 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -8960,6 +8998,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -9056,12 +9095,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 5700 +size: 5743 location: clients/tests/test-client.py:test_003()/199 cmd: $NMCLI --mode multiline --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 5530 bytes +stdout: 5573 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -9086,6 +9125,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -9182,12 +9222,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 4995 +size: 5038 location: clients/tests/test-client.py:test_003()/200 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 4795 bytes +stdout: 4838 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -9212,6 +9252,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -9294,12 +9335,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 5028 +size: 5071 location: clients/tests/test-client.py:test_003()/201 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4818 bytes +stdout: 4861 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -9324,6 +9365,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -9778,12 +9820,12 @@ TYPE: ethernet ------------------------------------------------------------------------------- <<< -size: 6905 +size: 6948 location: clients/tests/test-client.py:test_003()/208 cmd: $NMCLI --mode multiline --pretty con s ethernet lang: C returncode: 0 -stdout: 6748 bytes +stdout: 6791 bytes >>> =============================================================================== Connection profile details (ethernet) @@ -9811,6 +9853,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- 802-3-ethernet.port: -- @@ -9920,12 +9963,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 6961 +size: 7004 location: clients/tests/test-client.py:test_003()/209 cmd: $NMCLI --mode multiline --pretty con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 6794 bytes +stdout: 6837 bytes >>> =============================================================================== Szczegóły profilu połączenia (ethernet) @@ -9953,6 +9996,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- 802-3-ethernet.port: -- @@ -10062,12 +10106,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 5924 +size: 5967 location: clients/tests/test-client.py:test_003()/210 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 5727 bytes +stdout: 5770 bytes >>> =============================================================================== Connection profile details (ethernet) @@ -10095,6 +10139,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- 802-3-ethernet.port: -- @@ -10186,12 +10231,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 5969 +size: 6012 location: clients/tests/test-client.py:test_003()/211 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5762 bytes +stdout: 5805 bytes >>> =============================================================================== Szczegóły profilu połączenia (ethernet) @@ -10219,6 +10264,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- 802-3-ethernet.port: -- @@ -10706,12 +10752,12 @@ TYPE: ethernet ------------------------------------------------------------------------------- <<< -size: 6917 +size: 6960 location: clients/tests/test-client.py:test_003()/218 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet lang: C returncode: 0 -stdout: 6748 bytes +stdout: 6791 bytes >>> =============================================================================== Connection profile details (ethernet) @@ -10739,6 +10785,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- 802-3-ethernet.port: -- @@ -10848,12 +10895,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 6973 +size: 7016 location: clients/tests/test-client.py:test_003()/219 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 6794 bytes +stdout: 6837 bytes >>> =============================================================================== Szczegóły profilu połączenia (ethernet) @@ -10881,6 +10928,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- 802-3-ethernet.port: -- @@ -10990,12 +11038,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 5936 +size: 5979 location: clients/tests/test-client.py:test_003()/220 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 5727 bytes +stdout: 5770 bytes >>> =============================================================================== Connection profile details (ethernet) @@ -11023,6 +11071,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- 802-3-ethernet.port: -- @@ -11114,12 +11163,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 5981 +size: 6024 location: clients/tests/test-client.py:test_003()/221 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5762 bytes +stdout: 5805 bytes >>> =============================================================================== Szczegóły profilu połączenia (ethernet) @@ -11147,6 +11196,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- 802-3-ethernet.port: -- @@ -11604,12 +11654,12 @@ UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA TYPE:802-3-ethernet <<< -size: 3018 +size: 3038 location: clients/tests/test-client.py:test_003()/228 cmd: $NMCLI --mode multiline --terse con s ethernet lang: C returncode: 0 -stdout: 2862 bytes +stdout: 2882 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -11634,6 +11684,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 @@ -11730,12 +11781,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 3028 +size: 3048 location: clients/tests/test-client.py:test_003()/229 cmd: $NMCLI --mode multiline --terse con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 2862 bytes +stdout: 2882 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -11760,6 +11811,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 @@ -11856,12 +11908,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2672 +size: 2692 location: clients/tests/test-client.py:test_003()/230 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 2476 bytes +stdout: 2496 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -11886,6 +11938,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 @@ -11968,12 +12021,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2682 +size: 2702 location: clients/tests/test-client.py:test_003()/231 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2476 bytes +stdout: 2496 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -11998,6 +12051,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 @@ -12422,12 +12476,12 @@ UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA TYPE:802-3-ethernet <<< -size: 3030 +size: 3050 location: clients/tests/test-client.py:test_003()/238 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet lang: C returncode: 0 -stdout: 2862 bytes +stdout: 2882 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -12452,6 +12506,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 @@ -12548,12 +12603,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 3040 +size: 3060 location: clients/tests/test-client.py:test_003()/239 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 2862 bytes +stdout: 2882 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -12578,6 +12633,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 @@ -12674,12 +12730,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2684 +size: 2704 location: clients/tests/test-client.py:test_003()/240 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 2476 bytes +stdout: 2496 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -12704,6 +12760,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 @@ -12786,12 +12843,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2694 +size: 2714 location: clients/tests/test-client.py:test_003()/241 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2476 bytes +stdout: 2496 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -12816,6 +12873,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 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 08be36d466..2c7418bfcf 100644 --- a/clients/tests/test-client.check-on-disk/test_004.expected +++ b/clients/tests/test-client.check-on-disk/test_004.expected @@ -58,12 +58,12 @@ location: clients/tests/test-client.py:test_004()/7 cmd: $NMCLI connection mod con-xx1 ipv4.addresses 192.168.77.5/24 ipv4.routes '2.3.4.5/32 192.168.77.1' ipv6.addresses 1:2:3:4::6/64 ipv6.routes 1:2:3:4:5:6::5/128 lang: C returncode: 0 -size: 4464 +size: 4507 location: clients/tests/test-client.py:test_004()/8 cmd: $NMCLI con s con-xx1 lang: C returncode: 0 -stdout: 4336 bytes +stdout: 4379 bytes >>> connection.id: con-xx1 connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA @@ -88,6 +88,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-11-wireless.ssid: foobar 802-11-wireless.mode: infrastructure @@ -160,12 +161,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 4492 +size: 4535 location: clients/tests/test-client.py:test_004()/9 cmd: $NMCLI con s con-xx1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4354 bytes +stdout: 4397 bytes >>> connection.id: con-xx1 connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA @@ -190,6 +191,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 802-11-wireless.ssid: foobar 802-11-wireless.mode: infrastructure @@ -298,12 +300,12 @@ con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP vpn -- con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA wifi -- <<< -size: 3931 +size: 3974 location: clients/tests/test-client.py:test_004()/13 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 -stdout: 3800 bytes +stdout: 3843 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -328,6 +330,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -389,12 +392,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 3951 +size: 3994 location: clients/tests/test-client.py:test_004()/14 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3810 bytes +stdout: 3853 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -419,6 +422,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -552,12 +556,12 @@ con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA wifi wlan0 con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- <<< -size: 5056 +size: 5099 location: clients/tests/test-client.py:test_004()/21 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 -stdout: 4925 bytes +stdout: 4968 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -582,6 +586,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -664,12 +669,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5082 +size: 5125 location: clients/tests/test-client.py:test_004()/22 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4941 bytes +stdout: 4984 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -694,6 +699,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -776,12 +782,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5062 +size: 5105 location: clients/tests/test-client.py:test_004()/23 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 -stdout: 4931 bytes +stdout: 4974 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -806,6 +812,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -888,12 +895,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5092 +size: 5135 location: clients/tests/test-client.py:test_004()/24 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4951 bytes +stdout: 4994 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -918,6 +925,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -1000,12 +1008,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5062 +size: 5105 location: clients/tests/test-client.py:test_004()/25 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 -stdout: 4931 bytes +stdout: 4974 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -1030,6 +1038,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -1112,12 +1121,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5092 +size: 5135 location: clients/tests/test-client.py:test_004()/26 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4951 bytes +stdout: 4994 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -1142,6 +1151,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -1224,12 +1234,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 3938 +size: 3981 location: clients/tests/test-client.py:test_004()/27 cmd: $NMCLI -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 3800 bytes +stdout: 3843 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -1254,6 +1264,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -1315,12 +1326,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 3958 +size: 4001 location: clients/tests/test-client.py:test_004()/28 cmd: $NMCLI -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3810 bytes +stdout: 3853 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -1345,6 +1356,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -3966,12 +3978,12 @@ connection.type: 802-11-wireless connection.interface-name: -- <<< -size: 5074 +size: 5117 location: clients/tests/test-client.py:test_004()/73 cmd: $NMCLI --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 4931 bytes +stdout: 4974 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -3996,6 +4008,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -4078,12 +4091,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5104 +size: 5147 location: clients/tests/test-client.py:test_004()/74 cmd: $NMCLI --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4951 bytes +stdout: 4994 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -4108,6 +4121,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -4190,12 +4204,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5074 +size: 5117 location: clients/tests/test-client.py:test_004()/75 cmd: $NMCLI --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 4931 bytes +stdout: 4974 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -4220,6 +4234,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -4302,12 +4317,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5104 +size: 5147 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: 4951 bytes +stdout: 4994 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -4332,6 +4347,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -4414,12 +4430,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 3950 +size: 3993 location: clients/tests/test-client.py:test_004()/77 cmd: $NMCLI --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 3800 bytes +stdout: 3843 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -4444,6 +4460,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -4505,12 +4522,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 3970 +size: 4013 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 -stdout: 3810 bytes +stdout: 3853 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -4535,6 +4552,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -7156,12 +7174,12 @@ connection.type: 802-11-wireless connection.interface-name: -- <<< -size: 6084 +size: 6127 location: clients/tests/test-client.py:test_004()/123 cmd: $NMCLI --pretty con s con-vpn-1 lang: C returncode: 0 -stdout: 5943 bytes +stdout: 5986 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -7189,6 +7207,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- ipv4.method: auto @@ -7281,12 +7300,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 6126 +size: 6169 location: clients/tests/test-client.py:test_004()/124 cmd: $NMCLI --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5975 bytes +stdout: 6018 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -7314,6 +7333,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- ipv4.method: auto @@ -7406,12 +7426,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 6084 +size: 6127 location: clients/tests/test-client.py:test_004()/125 cmd: $NMCLI --pretty con s con-vpn-1 lang: C returncode: 0 -stdout: 5943 bytes +stdout: 5986 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -7439,6 +7459,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- ipv4.method: auto @@ -7531,12 +7552,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 6126 +size: 6169 location: clients/tests/test-client.py:test_004()/126 cmd: $NMCLI --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5975 bytes +stdout: 6018 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -7564,6 +7585,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- ipv4.method: auto @@ -7656,12 +7678,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 4567 +size: 4610 location: clients/tests/test-client.py:test_004()/127 cmd: $NMCLI --pretty -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 4419 bytes +stdout: 4462 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -7689,6 +7711,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- ipv4.method: auto @@ -7755,12 +7778,12 @@ proxy.pac-script: -- ------------------------------------------------------------------------------- <<< -size: 4592 +size: 4635 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 -stdout: 4434 bytes +stdout: 4477 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -7788,6 +7811,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- ipv4.method: auto @@ -11018,12 +11042,12 @@ connection.interface-name: -- ------------------------------------------------------------------------------- <<< -size: 6096 +size: 6139 location: clients/tests/test-client.py:test_004()/173 cmd: $NMCLI --pretty --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 5943 bytes +stdout: 5986 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -11051,6 +11075,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- ipv4.method: auto @@ -11143,12 +11168,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 6138 +size: 6181 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 -stdout: 5975 bytes +stdout: 6018 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -11176,6 +11201,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- ipv4.method: auto @@ -11268,12 +11294,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 6096 +size: 6139 location: clients/tests/test-client.py:test_004()/175 cmd: $NMCLI --pretty --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 5943 bytes +stdout: 5986 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -11301,6 +11327,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- ipv4.method: auto @@ -11393,12 +11420,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 6138 +size: 6181 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 -stdout: 5975 bytes +stdout: 6018 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -11426,6 +11453,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- ipv4.method: auto @@ -11518,12 +11546,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 4579 +size: 4622 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 -stdout: 4419 bytes +stdout: 4462 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -11551,6 +11579,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- ipv4.method: auto @@ -11617,12 +11646,12 @@ proxy.pac-script: -- ------------------------------------------------------------------------------- <<< -size: 4604 +size: 4647 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 -stdout: 4434 bytes +stdout: 4477 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -11650,6 +11679,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- ipv4.method: auto @@ -14880,12 +14910,12 @@ connection.interface-name: -- ------------------------------------------------------------------------------- <<< -size: 2536 +size: 2556 location: clients/tests/test-client.py:test_004()/223 cmd: $NMCLI --terse con s con-vpn-1 lang: C returncode: 0 -stdout: 2396 bytes +stdout: 2416 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -14910,6 +14940,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 ipv4.method:auto ipv4.dns: @@ -14992,12 +15023,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2546 +size: 2566 location: clients/tests/test-client.py:test_004()/224 cmd: $NMCLI --terse con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2396 bytes +stdout: 2416 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -15022,6 +15053,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 ipv4.method:auto ipv4.dns: @@ -15104,12 +15136,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2536 +size: 2556 location: clients/tests/test-client.py:test_004()/225 cmd: $NMCLI --terse con s con-vpn-1 lang: C returncode: 0 -stdout: 2396 bytes +stdout: 2416 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -15134,6 +15166,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 ipv4.method:auto ipv4.dns: @@ -15216,12 +15249,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2546 +size: 2566 location: clients/tests/test-client.py:test_004()/226 cmd: $NMCLI --terse con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2396 bytes +stdout: 2416 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -15246,6 +15279,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 ipv4.method:auto ipv4.dns: @@ -15328,12 +15362,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 1966 +size: 1986 location: clients/tests/test-client.py:test_004()/227 cmd: $NMCLI --terse -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 1819 bytes +stdout: 1839 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -15358,6 +15392,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 ipv4.method:auto ipv4.dns: @@ -15419,12 +15454,12 @@ proxy.pac-url: proxy.pac-script: <<< -size: 1976 +size: 1996 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 -stdout: 1819 bytes +stdout: 1839 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -15449,6 +15484,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 ipv4.method:auto ipv4.dns: @@ -18040,12 +18076,12 @@ connection.type:802-11-wireless connection.interface-name: <<< -size: 2548 +size: 2568 location: clients/tests/test-client.py:test_004()/273 cmd: $NMCLI --terse --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 2396 bytes +stdout: 2416 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -18070,6 +18106,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 ipv4.method:auto ipv4.dns: @@ -18152,12 +18189,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2558 +size: 2578 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 -stdout: 2396 bytes +stdout: 2416 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -18182,6 +18219,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 ipv4.method:auto ipv4.dns: @@ -18264,12 +18302,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2548 +size: 2568 location: clients/tests/test-client.py:test_004()/275 cmd: $NMCLI --terse --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 2396 bytes +stdout: 2416 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -18294,6 +18332,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 ipv4.method:auto ipv4.dns: @@ -18376,12 +18415,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2558 +size: 2578 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 -stdout: 2396 bytes +stdout: 2416 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -18406,6 +18445,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 ipv4.method:auto ipv4.dns: @@ -18488,12 +18528,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 1978 +size: 1998 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 -stdout: 1819 bytes +stdout: 1839 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -18518,6 +18558,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 ipv4.method:auto ipv4.dns: @@ -18579,12 +18620,12 @@ proxy.pac-url: proxy.pac-script: <<< -size: 1988 +size: 2008 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 -stdout: 1819 bytes +stdout: 1839 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -18609,6 +18650,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 ipv4.method:auto ipv4.dns: @@ -21200,15 +21242,15 @@ connection.type:802-11-wireless connection.interface-name: <<< -size: 3277 +size: 3295 location: clients/tests/test-client.py:test_004()/323 cmd: $NMCLI --mode tabular con s con-vpn-1 lang: C returncode: 0 -stdout: 3130 bytes +stdout: 3148 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -- -1 name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) @@ -21229,15 +21271,15 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN connected key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 3300 +size: 3318 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 -stdout: 3143 bytes +stdout: 3161 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -- -1 name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) @@ -21258,15 +21300,15 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połączono z VPN key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 3277 +size: 3295 location: clients/tests/test-client.py:test_004()/325 cmd: $NMCLI --mode tabular con s con-vpn-1 lang: C returncode: 0 -stdout: 3130 bytes +stdout: 3148 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -- -1 name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) @@ -21287,15 +21329,15 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN connected key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 3300 +size: 3318 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 -stdout: 3143 bytes +stdout: 3161 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -- -1 name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) @@ -21316,15 +21358,15 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połączono z VPN key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 2525 +size: 2543 location: clients/tests/test-client.py:test_004()/327 cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 2371 bytes +stdout: 2389 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -- -1 name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) @@ -21340,15 +21382,15 @@ proxy none no -- -- <<< -size: 2537 +size: 2555 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 -stdout: 2373 bytes +stdout: 2391 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -- -1 name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) @@ -22854,15 +22896,15 @@ interface-name <<< -size: 3289 +size: 3307 location: clients/tests/test-client.py:test_004()/373 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 3130 bytes +stdout: 3148 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -- -1 name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) @@ -22883,15 +22925,15 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN connected key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 3312 +size: 3330 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 -stdout: 3143 bytes +stdout: 3161 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -- -1 name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) @@ -22912,15 +22954,15 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połączono z VPN key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 3289 +size: 3307 location: clients/tests/test-client.py:test_004()/375 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 3130 bytes +stdout: 3148 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -- -1 name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) @@ -22941,15 +22983,15 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN connected key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 3312 +size: 3330 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 -stdout: 3143 bytes +stdout: 3161 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -- -1 name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) @@ -22970,15 +23012,15 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połączono z VPN key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 2537 +size: 2555 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 -stdout: 2371 bytes +stdout: 2389 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -- -1 name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- no no -- -- 0 (default) yes -- -- 0x0 (none) no yes -1 (default) @@ -22994,15 +23036,15 @@ proxy none no -- -- <<< -size: 2549 +size: 2567 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 -stdout: 2373 bytes +stdout: 2391 bytes >>> -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -- -1 name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout ipv4 auto -- -- -- 0 -- -- -- -1 0 (unspec) -- nie nie -- -- 0 (default) tak -- -- 0x0 (none) nie tak -1 (default) @@ -24508,19 +24550,19 @@ interface-name <<< -size: 5193 +size: 5220 location: clients/tests/test-client.py:test_004()/423 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1 lang: C returncode: 0 -stdout: 5037 bytes +stdout: 5064 bytes >>> ========================================== Connection profile details (con-vpn-1) ========================================== -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -- -1 name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -24550,19 +24592,19 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN connected key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 5249 +size: 5276 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 -stdout: 5083 bytes +stdout: 5110 bytes >>> ============================================ Szczegóły profilu połączenia (con-vpn-1) ============================================ -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -- -1 name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -24592,19 +24634,19 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połączono z VPN key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 5193 +size: 5220 location: clients/tests/test-client.py:test_004()/425 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1 lang: C returncode: 0 -stdout: 5037 bytes +stdout: 5064 bytes >>> ========================================== Connection profile details (con-vpn-1) ========================================== -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -- -1 name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -24634,19 +24676,19 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN connected key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 5249 +size: 5276 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 -stdout: 5083 bytes +stdout: 5110 bytes >>> ============================================ Szczegóły profilu połączenia (con-vpn-1) ============================================ -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -- -1 name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -24676,19 +24718,19 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połączono z VPN key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 3849 +size: 3876 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 -stdout: 3686 bytes +stdout: 3713 bytes >>> ========================================== Connection profile details (con-vpn-1) ========================================== -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -- -1 name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -24708,19 +24750,19 @@ proxy none no -- -- <<< -size: 3872 +size: 3899 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 -stdout: 3699 bytes +stdout: 3726 bytes >>> ============================================ Szczegóły profilu połączenia (con-vpn-1) ============================================ -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -- -1 name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -26816,19 +26858,19 @@ interface-name <<< -size: 5205 +size: 5232 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 -stdout: 5037 bytes +stdout: 5064 bytes >>> ========================================== Connection profile details (con-vpn-1) ========================================== -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -- -1 name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -26858,19 +26900,19 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN connected key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 5261 +size: 5288 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 -stdout: 5083 bytes +stdout: 5110 bytes >>> ============================================ Szczegóły profilu połączenia (con-vpn-1) ============================================ -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -- -1 name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -26900,19 +26942,19 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połączono z VPN key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 5205 +size: 5232 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 -stdout: 5037 bytes +stdout: 5064 bytes >>> ========================================== Connection profile details (con-vpn-1) ========================================== -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -- -1 name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -26942,19 +26984,19 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN connected key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 5261 +size: 5288 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 -stdout: 5083 bytes +stdout: 5110 bytes >>> ============================================ Szczegóły profilu połączenia (con-vpn-1) ============================================ -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -- -1 name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -26984,19 +27026,19 @@ NAME TYPE USERNAME GATEWAY BANNER VPN-STATE VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 — Połączono z VPN key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 3861 +size: 3888 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 -stdout: 3686 bytes +stdout: 3713 bytes >>> ========================================== Connection profile details (con-vpn-1) ========================================== -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- yes 0 -1 (default) 0 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) -1 (default) -- -1 name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -27016,19 +27058,19 @@ proxy none no -- -- <<< -size: 3884 +size: 3911 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 -stdout: 3699 bytes +stdout: 3726 bytes >>> ============================================ Szczegóły profilu połączenia (con-vpn-1) ============================================ -name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr wait-device-timeout ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -1 +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries multi-connect auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns llmnr mud-url wait-device-timeout +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +connection con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP -- vpn -- tak 0 -1 (default) 0 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) -1 (default) -- -1 name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table routing-rules ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-iaid dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn dhcp-hostname-flags never-default may-fail dad-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -29124,14 +29166,14 @@ interface-name <<< -size: 804 +size: 805 location: clients/tests/test-client.py:test_004()/523 cmd: $NMCLI --mode tabular --terse con s con-vpn-1 lang: C returncode: 0 -stdout: 650 bytes +stdout: 651 bytes >>> -connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1 +connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3::no:0 @@ -29140,14 +29182,14 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 814 +size: 815 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 -stdout: 650 bytes +stdout: 651 bytes >>> -connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1 +connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3::no:0 @@ -29156,14 +29198,14 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 804 +size: 805 location: clients/tests/test-client.py:test_004()/525 cmd: $NMCLI --mode tabular --terse con s con-vpn-1 lang: C returncode: 0 -stdout: 650 bytes +stdout: 651 bytes >>> -connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1 +connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3::no:0 @@ -29172,14 +29214,14 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 814 +size: 815 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 -stdout: 650 bytes +stdout: 651 bytes >>> -connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1 +connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3::no:0 @@ -29188,28 +29230,28 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 516 +size: 517 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 -stdout: 355 bytes +stdout: 356 bytes >>> -connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1 +connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3::no:0 proxy:none:no:: <<< -size: 526 +size: 527 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 -stdout: 355 bytes +stdout: 356 bytes >>> -connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1 +connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3::no:0 @@ -30062,14 +30104,14 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA <<< -size: 816 +size: 817 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 -stdout: 650 bytes +stdout: 651 bytes >>> -connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1 +connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3::no:0 @@ -30078,14 +30120,14 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 826 +size: 827 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 -stdout: 650 bytes +stdout: 651 bytes >>> -connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1 +connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3::no:0 @@ -30094,14 +30136,14 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 816 +size: 817 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 -stdout: 650 bytes +stdout: 651 bytes >>> -connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1 +connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3::no:0 @@ -30110,14 +30152,14 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 826 +size: 827 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 -stdout: 650 bytes +stdout: 651 bytes >>> -connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1 +connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3::no:0 @@ -30126,28 +30168,28 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::y VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 528 +size: 529 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 -stdout: 355 bytes +stdout: 356 bytes >>> -connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1 +connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3::no:0 proxy:none:no:: <<< -size: 538 +size: 539 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 -stdout: 355 bytes +stdout: 356 bytes >>> -connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1 +connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1::-1 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1 ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3::no:0 @@ -31000,12 +31042,12 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA <<< -size: 5080 +size: 5123 location: clients/tests/test-client.py:test_004()/623 cmd: $NMCLI --mode multiline con s con-vpn-1 lang: C returncode: 0 -stdout: 4931 bytes +stdout: 4974 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -31030,6 +31072,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -31112,12 +31155,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5110 +size: 5153 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 -stdout: 4951 bytes +stdout: 4994 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -31142,6 +31185,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -31224,12 +31268,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5080 +size: 5123 location: clients/tests/test-client.py:test_004()/625 cmd: $NMCLI --mode multiline con s con-vpn-1 lang: C returncode: 0 -stdout: 4931 bytes +stdout: 4974 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -31254,6 +31298,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -31336,12 +31381,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5110 +size: 5153 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 -stdout: 4951 bytes +stdout: 4994 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -31366,6 +31411,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -31448,12 +31494,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 3956 +size: 3999 location: clients/tests/test-client.py:test_004()/627 cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 3800 bytes +stdout: 3843 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -31478,6 +31524,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -31539,12 +31586,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 3976 +size: 4019 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 -stdout: 3810 bytes +stdout: 3853 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -31569,6 +31616,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -34690,12 +34738,12 @@ connection.type: 802-11-wireless connection.interface-name: -- <<< -size: 5092 +size: 5135 location: clients/tests/test-client.py:test_004()/673 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 4931 bytes +stdout: 4974 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -34720,6 +34768,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -34802,12 +34851,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5122 +size: 5165 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 -stdout: 4951 bytes +stdout: 4994 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -34832,6 +34881,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -34914,12 +34964,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5092 +size: 5135 location: clients/tests/test-client.py:test_004()/675 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 4931 bytes +stdout: 4974 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -34944,6 +34994,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -35026,12 +35077,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 5122 +size: 5165 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 -stdout: 4951 bytes +stdout: 4994 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -35056,6 +35107,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -35138,12 +35190,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 3968 +size: 4011 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 -stdout: 3800 bytes +stdout: 3843 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -35168,6 +35220,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -35229,12 +35282,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 3988 +size: 4031 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 -stdout: 3810 bytes +stdout: 3853 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -35259,6 +35312,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ipv4.method: auto ipv4.dns: -- @@ -38380,12 +38434,12 @@ connection.type: 802-11-wireless connection.interface-name: -- <<< -size: 6101 +size: 6144 location: clients/tests/test-client.py:test_004()/723 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1 lang: C returncode: 0 -stdout: 5943 bytes +stdout: 5986 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -38413,6 +38467,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- ipv4.method: auto @@ -38505,12 +38560,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 6143 +size: 6186 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 -stdout: 5975 bytes +stdout: 6018 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -38538,6 +38593,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- ipv4.method: auto @@ -38630,12 +38686,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 6101 +size: 6144 location: clients/tests/test-client.py:test_004()/725 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1 lang: C returncode: 0 -stdout: 5943 bytes +stdout: 5986 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -38663,6 +38719,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- ipv4.method: auto @@ -38755,12 +38812,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 6143 +size: 6186 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 -stdout: 5975 bytes +stdout: 6018 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -38788,6 +38845,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- ipv4.method: auto @@ -38880,12 +38938,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 4584 +size: 4627 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 -stdout: 4419 bytes +stdout: 4462 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -38913,6 +38971,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- ipv4.method: auto @@ -38979,12 +39038,12 @@ proxy.pac-script: -- ------------------------------------------------------------------------------- <<< -size: 4609 +size: 4652 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 -stdout: 4434 bytes +stdout: 4477 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -39012,6 +39071,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- ipv4.method: auto @@ -42772,12 +42832,12 @@ connection.interface-name: -- ------------------------------------------------------------------------------- <<< -size: 6113 +size: 6156 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 -stdout: 5943 bytes +stdout: 5986 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -42805,6 +42865,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- ipv4.method: auto @@ -42897,12 +42958,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 6155 +size: 6198 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 -stdout: 5975 bytes +stdout: 6018 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -42930,6 +42991,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- ipv4.method: auto @@ -43022,12 +43084,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 6113 +size: 6156 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 -stdout: 5943 bytes +stdout: 5986 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -43055,6 +43117,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- ipv4.method: auto @@ -43147,12 +43210,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 6155 +size: 6198 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 -stdout: 5975 bytes +stdout: 6018 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -43180,6 +43243,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- ipv4.method: auto @@ -43272,12 +43336,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 4596 +size: 4639 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 -stdout: 4419 bytes +stdout: 4462 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -43305,6 +43369,7 @@ connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- ipv4.method: auto @@ -43371,12 +43436,12 @@ proxy.pac-script: -- ------------------------------------------------------------------------------- <<< -size: 4621 +size: 4664 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 -stdout: 4434 bytes +stdout: 4477 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -43404,6 +43469,7 @@ connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) connection.llmnr: -1 (default) +connection.mud-url: -- connection.wait-device-timeout: -1 ------------------------------------------------------------------------------- ipv4.method: auto @@ -47164,12 +47230,12 @@ connection.interface-name: -- ------------------------------------------------------------------------------- <<< -size: 2553 +size: 2573 location: clients/tests/test-client.py:test_004()/823 cmd: $NMCLI --mode multiline --terse con s con-vpn-1 lang: C returncode: 0 -stdout: 2396 bytes +stdout: 2416 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -47194,6 +47260,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 ipv4.method:auto ipv4.dns: @@ -47276,12 +47343,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2563 +size: 2583 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 -stdout: 2396 bytes +stdout: 2416 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -47306,6 +47373,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 ipv4.method:auto ipv4.dns: @@ -47388,12 +47456,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2553 +size: 2573 location: clients/tests/test-client.py:test_004()/825 cmd: $NMCLI --mode multiline --terse con s con-vpn-1 lang: C returncode: 0 -stdout: 2396 bytes +stdout: 2416 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -47418,6 +47486,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 ipv4.method:auto ipv4.dns: @@ -47500,12 +47569,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2563 +size: 2583 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 -stdout: 2396 bytes +stdout: 2416 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -47530,6 +47599,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 ipv4.method:auto ipv4.dns: @@ -47612,12 +47682,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 1983 +size: 2003 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 -stdout: 1819 bytes +stdout: 1839 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -47642,6 +47712,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 ipv4.method:auto ipv4.dns: @@ -47703,12 +47774,12 @@ proxy.pac-url: proxy.pac-script: <<< -size: 1993 +size: 2013 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 -stdout: 1819 bytes +stdout: 1839 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -47733,6 +47804,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 ipv4.method:auto ipv4.dns: @@ -50854,12 +50926,12 @@ connection.type:802-11-wireless connection.interface-name: <<< -size: 2565 +size: 2585 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 -stdout: 2396 bytes +stdout: 2416 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -50884,6 +50956,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 ipv4.method:auto ipv4.dns: @@ -50966,12 +51039,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2575 +size: 2595 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 -stdout: 2396 bytes +stdout: 2416 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -50996,6 +51069,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 ipv4.method:auto ipv4.dns: @@ -51078,12 +51152,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2565 +size: 2585 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 -stdout: 2396 bytes +stdout: 2416 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -51108,6 +51182,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 ipv4.method:auto ipv4.dns: @@ -51190,12 +51265,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2575 +size: 2595 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 -stdout: 2396 bytes +stdout: 2416 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -51220,6 +51295,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 ipv4.method:auto ipv4.dns: @@ -51302,12 +51378,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 1995 +size: 2015 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 -stdout: 1819 bytes +stdout: 1839 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -51332,6 +51408,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 ipv4.method:auto ipv4.dns: @@ -51393,12 +51470,12 @@ proxy.pac-url: proxy.pac-script: <<< -size: 2005 +size: 2025 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 -stdout: 1819 bytes +stdout: 1839 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -51423,6 +51500,7 @@ connection.metered:unknown connection.lldp:default connection.mdns:-1 connection.llmnr:-1 +connection.mud-url: connection.wait-device-timeout:-1 ipv4.method:auto ipv4.dns: diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c index 2e8fa37a2c..7fa768623c 100644 --- a/libnm-core/nm-setting-connection.c +++ b/libnm-core/nm-setting-connection.c @@ -63,6 +63,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMSettingConnection, PROP_STABLE_ID, PROP_AUTH_RETRIES, PROP_WAIT_DEVICE_TIMEOUT, + PROP_MUD_URL, ); typedef struct { @@ -76,6 +77,7 @@ typedef struct { char *master; char *slave_type; char *zone; + char *mud_url; guint64 timestamp; int autoconnect_priority; int autoconnect_retries; @@ -750,6 +752,23 @@ nm_setting_connection_get_secondary (NMSettingConnection *setting, guint32 idx) return (const char *) g_slist_nth_data (priv->secondaries, idx); } +/** + * nm_setting_connection_get_mud_url: + * @setting: the #NMSettingConnection + * + * Returns the value contained in the #NMSettingConnection:mud-url + * property. + **/ + +const char * +nm_setting_connection_get_mud_url (NMSettingConnection *setting) +{ + g_return_val_if_fail (NM_IS_SETTING_CONNECTION (setting), NULL); + + return NM_SETTING_CONNECTION_GET_PRIVATE (setting)->mud_url; +} + + /** * nm_setting_connection_add_secondary: * @setting: the #NMSettingConnection @@ -1222,6 +1241,13 @@ after_interface_name: return NM_SETTING_VERIFY_NORMALIZABLE_ERROR; } + if (priv->mud_url && !*priv->mud_url) { + g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("property is empty")); + g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), NM_SETTING_CONNECTION_MUD_URL); + return NM_SETTING_VERIFY_NORMALIZABLE_ERROR; + } + if (normerr_base_type) { g_set_error (error, NM_CONNECTION_ERROR, @@ -1467,6 +1493,9 @@ get_property (GObject *object, guint prop_id, case PROP_WAIT_DEVICE_TIMEOUT: g_value_set_int (value, priv->wait_device_timeout); break; + case PROP_MUD_URL: + g_value_set_string (value, nm_setting_connection_get_mud_url(setting)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -1562,6 +1591,10 @@ set_property (GObject *object, guint prop_id, case PROP_WAIT_DEVICE_TIMEOUT: priv->wait_device_timeout = g_value_get_int (value); break; + case PROP_MUD_URL: + g_free (priv->mud_url); + priv->mud_url = g_value_dup_string (value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -2286,6 +2319,30 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + + /** + * NMSettingConnection:mud-url: + * + * If configured, set to a Manufacturer Usage Description (MUD) URL that points + * to manufacturer-recommended network policies for IoT devices. It is transmitted + * as a DHCPv4 or DHCPv6 option. + * + **/ + /* ---ifcfg-rh--- + * property: mud-url + * variable: MUD_URL + * values: a valid URL that points to recommended policy for this device + * description: MUD_URL to be sent by device (See RFC 8520). + * example: https://yourdevice.example.com/model.json + * ---end--- + */ + + obj_properties[PROP_MUD_URL] = + g_param_spec_string (NM_SETTING_CONNECTION_MUD_URL, "", "", + NULL, + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); + g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties); _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_CONNECTION, diff --git a/libnm-core/nm-setting-connection.h b/libnm-core/nm-setting-connection.h index b93e9b4d7a..36df389671 100644 --- a/libnm-core/nm-setting-connection.h +++ b/libnm-core/nm-setting-connection.h @@ -52,6 +52,7 @@ G_BEGIN_DECLS #define NM_SETTING_CONNECTION_MDNS "mdns" #define NM_SETTING_CONNECTION_LLMNR "llmnr" #define NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT "wait-device-timeout" +#define NM_SETTING_CONNECTION_MUD_URL "mud-url" /* Types for property values */ /** @@ -204,6 +205,8 @@ NMSettingConnectionLlmnr nm_setting_connection_get_llmnr (NMSettingConnection * NM_AVAILABLE_IN_1_20 gint32 nm_setting_connection_get_wait_device_timeout (NMSettingConnection *setting); +const char *nm_setting_connection_get_mud_url (NMSettingConnection *setting); + G_END_DECLS #endif /* __NM_SETTING_CONNECTION_H__ */ diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c index 138702e4ca..7da2479647 100644 --- a/libnm-core/tests/test-general.c +++ b/libnm-core/tests/test-general.c @@ -3334,6 +3334,7 @@ test_connection_diff_a_only (void) { NM_SETTING_CONNECTION_AUTH_RETRIES, NM_SETTING_DIFF_RESULT_IN_A }, { NM_SETTING_CONNECTION_MDNS, NM_SETTING_DIFF_RESULT_IN_A }, { NM_SETTING_CONNECTION_LLMNR, NM_SETTING_DIFF_RESULT_IN_A }, + { NM_SETTING_CONNECTION_MUD_URL, NM_SETTING_DIFF_RESULT_IN_A }, { NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT, NM_SETTING_DIFF_RESULT_IN_A }, { NULL, NM_SETTING_DIFF_RESULT_UNKNOWN } } }, diff --git a/libnm/libnm.ver b/libnm/libnm.ver index b5ce8c34a3..e572ccb3b2 100644 --- a/libnm/libnm.ver +++ b/libnm/libnm.ver @@ -473,6 +473,7 @@ global: nm_setting_connection_get_id; nm_setting_connection_get_interface_name; nm_setting_connection_get_master; + nm_setting_connection_get_mud_url; nm_setting_connection_get_num_permissions; nm_setting_connection_get_num_secondaries; nm_setting_connection_get_permission; diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index c3483e4db7..542b6371f6 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -8427,6 +8427,7 @@ dhcp4_start (NMDevice *self) gs_unref_bytes GBytes *bcast_hwaddr = NULL; gs_unref_bytes GBytes *client_id = NULL; NMConnection *connection; + NMSettingConnection *s_connection; GError *error = NULL; const NMPlatformLink *pllink; @@ -8435,6 +8436,9 @@ dhcp4_start (NMDevice *self) s_ip4 = nm_connection_get_setting_ip4_config (connection); + s_connection = nm_connection_get_setting_connection (connection); + nm_assert (s_connection); + /* Clear old exported DHCP options */ nm_dbus_object_clear_and_unexport (&priv->dhcp_data_4.config); priv->dhcp_data_4.config = nm_dhcp_config_new (AF_INET); @@ -8461,6 +8465,7 @@ dhcp4_start (NMDevice *self) nm_setting_ip_config_get_dhcp_hostname (s_ip4), nm_setting_ip4_config_get_dhcp_fqdn (NM_SETTING_IP4_CONFIG (s_ip4)), get_dhcp_hostname_flags (self, AF_INET), + nm_setting_connection_get_mud_url (s_connection), client_id, get_dhcp_timeout (self, AF_INET), priv->dhcp_anycast_address, @@ -9211,12 +9216,14 @@ dhcp6_start_with_link_ready (NMDevice *self, NMConnection *connection) GError *error = NULL; guint32 iaid; gboolean iaid_explicit; - + NMSettingConnection *s_connection; const NMPlatformIP6Address *ll_addr = NULL; g_assert (connection); s_ip6 = nm_connection_get_setting_ip6_config (connection); g_assert (s_ip6); + s_connection = nm_connection_get_setting_connection (connection); + nm_assert (s_connection); if (priv->ext_ip6_config_captured) { ll_addr = nm_ip6_config_find_first_address (priv->ext_ip6_config_captured, @@ -9251,6 +9258,7 @@ dhcp6_start_with_link_ready (NMDevice *self, NMConnection *connection) nm_setting_ip_config_get_dhcp_send_hostname (s_ip6), nm_setting_ip_config_get_dhcp_hostname (s_ip6), get_dhcp_hostname_flags (self, AF_INET6), + nm_setting_connection_get_mud_url (s_connection), duid, enforce_duid, iaid, diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c index 90a64acac5..b3c9fa88f5 100644 --- a/src/dhcp/nm-dhcp-client.c +++ b/src/dhcp/nm-dhcp-client.c @@ -50,6 +50,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMDhcpClient, PROP_IAID_EXPLICIT, PROP_HOSTNAME, PROP_HOSTNAME_FLAGS, + PROP_MUDURL, ); typedef struct _NMDhcpClientPrivate { @@ -60,6 +61,7 @@ typedef struct _NMDhcpClientPrivate { char * uuid; GBytes * client_id; char * hostname; + char * mudurl; pid_t pid; guint timeout_id; guint watch_id; @@ -312,6 +314,14 @@ nm_dhcp_client_get_use_fqdn (NMDhcpClient *self) return NM_DHCP_CLIENT_GET_PRIVATE (self)->use_fqdn; } +const char * +nm_dhcp_client_get_mudurl (NMDhcpClient *self) +{ + g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), NULL); + + return NM_DHCP_CLIENT_GET_PRIVATE (self)->mudurl; +} + /*****************************************************************************/ static const char *state_table[NM_DHCP_STATE_MAX + 1] = { @@ -970,6 +980,9 @@ get_property (GObject *object, guint prop_id, case PROP_HOSTNAME: g_value_set_string (value, priv->hostname); break; + case PROP_MUDURL: + g_value_set_string (value, priv->mudurl); + break; case PROP_ROUTE_METRIC: g_value_set_uint (value, priv->route_metric); break; @@ -1052,6 +1065,10 @@ set_property (GObject *object, guint prop_id, /* construct-only */ priv->hostname_flags = g_value_get_uint (value); break; + case PROP_MUDURL: + /* construct-only */ + priv->mudurl = g_value_dup_string (value); + break; case PROP_ROUTE_TABLE: priv->route_table = g_value_get_uint (value); break; @@ -1191,6 +1208,12 @@ nm_dhcp_client_class_init (NMDhcpClientClass *client_class) G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); + obj_properties[PROP_MUDURL] = + g_param_spec_string (NM_DHCP_CLIENT_MUDURL, "", "", + NULL, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS); + obj_properties[PROP_ROUTE_TABLE] = g_param_spec_uint (NM_DHCP_CLIENT_ROUTE_TABLE, "", "", 0, G_MAXUINT32, RT_TABLE_MAIN, diff --git a/src/dhcp/nm-dhcp-client.h b/src/dhcp/nm-dhcp-client.h index 1ff09067e8..eb49488ede 100644 --- a/src/dhcp/nm-dhcp-client.h +++ b/src/dhcp/nm-dhcp-client.h @@ -30,6 +30,7 @@ #define NM_DHCP_CLIENT_INTERFACE "iface" #define NM_DHCP_CLIENT_MULTI_IDX "multi-idx" #define NM_DHCP_CLIENT_HOSTNAME "hostname" +#define NM_DHCP_CLIENT_MUDURL "mudurl" #define NM_DHCP_CLIENT_ROUTE_METRIC "route-metric" #define NM_DHCP_CLIENT_ROUTE_TABLE "route-table" #define NM_DHCP_CLIENT_TIMEOUT "timeout" @@ -141,6 +142,7 @@ gboolean nm_dhcp_client_get_iaid_explicit (NMDhcpClient *self); GBytes *nm_dhcp_client_get_client_id (NMDhcpClient *self); const char *nm_dhcp_client_get_hostname (NMDhcpClient *self); +const char *nm_dhcp_client_get_mudurl (NMDhcpClient *self); NMDhcpHostnameFlags nm_dhcp_client_get_hostname_flags (NMDhcpClient *self); diff --git a/src/dhcp/nm-dhcp-dhclient-utils.c b/src/dhcp/nm-dhcp-dhclient-utils.c index da28abad0d..bc80b54e77 100644 --- a/src/dhcp/nm-dhcp-dhclient-utils.c +++ b/src/dhcp/nm-dhcp-dhclient-utils.c @@ -33,6 +33,13 @@ #define ALSOREQ_TAG "also request " #define REQ_TAG "request " +#define MUDURLv4_DEF "option mudurl code 161 = text;\n" +#define MUDURLv4_FMT "send mudurl \"%s\";\n" + +#define MUDURLv6_DEF "option dhcp6.mudurl code 112 = text;\n" +#define MUDURLv6_FMT "send dhcp6.mudurl \"%s\";\n" + + static void add_request (GPtrArray *array, const char *item) { @@ -183,6 +190,19 @@ add_hostname6 (GString *str, } } +static void add_mudurl_config(GString *str, const char *mudurl, int addr_family) { + if (mudurl) { + if (addr_family == AF_INET) { + g_string_append (str, MUDURLv4_DEF); + g_string_append_printf (str, MUDURLv4_FMT, mudurl); + } else { + g_string_append (str, MUDURLv6_DEF); + g_string_append_printf (str, MUDURLv6_FMT, mudurl); + } + } +} + + static GBytes * read_client_id (const char *str) { @@ -286,6 +306,7 @@ nm_dhcp_dhclient_create_config (const char *interface, guint32 timeout, gboolean use_fqdn, NMDhcpHostnameFlags hostname_flags, + const char *mudurl, const char *orig_path, const char *orig_contents, GBytes **out_new_client_id) @@ -451,8 +472,9 @@ nm_dhcp_dhclient_create_config (const char *interface, g_string_append_printf (new_contents, "timeout %u;\n", timeout); } + add_mudurl_config(new_contents,mudurl,addr_family); if (addr_family == AF_INET) { - add_ip4_config (new_contents, client_id, hostname, use_fqdn, hostname_flags); + add_ip4_config (new_contents, client_id, hostname, use_fqdn, hostname_flags); add_request (reqs, "rfc3442-classless-static-routes"); add_request (reqs, "ms-classless-static-routes"); add_request (reqs, "static-routes"); @@ -460,7 +482,7 @@ nm_dhcp_dhclient_create_config (const char *interface, add_request (reqs, "ntp-servers"); add_request (reqs, "root-path"); } else { - add_hostname6 (new_contents, hostname, hostname_flags); + add_hostname6 (new_contents, hostname, hostname_flags); add_request (reqs, "dhcp6.name-servers"); add_request (reqs, "dhcp6.domain-search"); diff --git a/src/dhcp/nm-dhcp-dhclient-utils.h b/src/dhcp/nm-dhcp-dhclient-utils.h index 0cf538872c..20ea8d6852 100644 --- a/src/dhcp/nm-dhcp-dhclient-utils.h +++ b/src/dhcp/nm-dhcp-dhclient-utils.h @@ -17,6 +17,7 @@ char *nm_dhcp_dhclient_create_config (const char *interface, guint32 timeout, gboolean use_fqdn, NMDhcpHostnameFlags hostname_flags, + const char *mudurl, const char *orig_path, const char *orig_contents, GBytes **out_new_client_id); diff --git a/src/dhcp/nm-dhcp-dhclient.c b/src/dhcp/nm-dhcp-dhclient.c index 617ce2366f..5075702254 100644 --- a/src/dhcp/nm-dhcp-dhclient.c +++ b/src/dhcp/nm-dhcp-dhclient.c @@ -147,6 +147,7 @@ merge_dhclient_config (NMDhcpDhclient *self, guint32 timeout, gboolean use_fqdn, NMDhcpHostnameFlags hostname_flags, + const char *mudurl, const char *orig_path, GBytes **out_new_client_id, GError **error) @@ -176,6 +177,7 @@ merge_dhclient_config (NMDhcpDhclient *self, timeout, use_fqdn, hostname_flags, + mudurl, orig_path, orig, out_new_client_id); @@ -268,6 +270,7 @@ create_dhclient_config (NMDhcpDhclient *self, guint32 timeout, gboolean use_fqdn, NMDhcpHostnameFlags hostname_flags, + const char *mudurl, GBytes **out_new_client_id) { gs_free char *orig = NULL; @@ -296,6 +299,7 @@ create_dhclient_config (NMDhcpDhclient *self, timeout, use_fqdn, hostname_flags, + mudurl, orig, out_new_client_id, &error)) { @@ -496,6 +500,7 @@ ip4_start (NMDhcpClient *client, nm_dhcp_client_get_timeout (client), nm_dhcp_client_get_use_fqdn (client), nm_dhcp_client_get_hostname_flags (client), + nm_dhcp_client_get_mudurl (client), &new_client_id); if (!priv->conf_file) { nm_utils_error_set_literal (error, @@ -540,6 +545,7 @@ ip6_start (NMDhcpClient *client, nm_dhcp_client_get_timeout (client), TRUE, nm_dhcp_client_get_hostname_flags (client), + nm_dhcp_client_get_mudurl (client), NULL); if (!priv->conf_file) { nm_utils_error_set_literal (error, diff --git a/src/dhcp/nm-dhcp-manager.c b/src/dhcp/nm-dhcp-manager.c index 333744dd31..273e229a94 100644 --- a/src/dhcp/nm-dhcp-manager.c +++ b/src/dhcp/nm-dhcp-manager.c @@ -220,6 +220,7 @@ client_start (NMDhcpManager *self, const char *hostname, gboolean hostname_use_fqdn, NMDhcpHostnameFlags hostname_flags, + const char *mudurl, gboolean info_only, NMSettingIP6ConfigPrivacy privacy, const char *last_ip4_address, @@ -303,6 +304,7 @@ client_start (NMDhcpManager *self, NM_DHCP_CLIENT_IAID, (guint) iaid, NM_DHCP_CLIENT_IAID_EXPLICIT, iaid_explicit, NM_DHCP_CLIENT_HOSTNAME, hostname, + NM_DHCP_CLIENT_MUDURL, mudurl, NM_DHCP_CLIENT_ROUTE_TABLE, (guint) route_table, NM_DHCP_CLIENT_ROUTE_METRIC, (guint) route_metric, NM_DHCP_CLIENT_TIMEOUT, (guint) timeout, @@ -382,6 +384,7 @@ nm_dhcp_manager_start_ip4 (NMDhcpManager *self, const char *dhcp_hostname, const char *dhcp_fqdn, NMDhcpHostnameFlags hostname_flags, + const char *mudurl, GBytes *dhcp_client_id, guint32 timeout, const char *dhcp_anycast_addr, @@ -440,6 +443,7 @@ nm_dhcp_manager_start_ip4 (NMDhcpManager *self, hostname, use_fqdn, hostname_flags, + mudurl, FALSE, 0, last_ip_address, @@ -462,6 +466,7 @@ nm_dhcp_manager_start_ip6 (NMDhcpManager *self, gboolean send_hostname, const char *dhcp_hostname, NMDhcpHostnameFlags hostname_flags, + const char *mudurl, GBytes *duid, gboolean enforce_duid, guint32 iaid, @@ -503,6 +508,7 @@ nm_dhcp_manager_start_ip6 (NMDhcpManager *self, hostname, TRUE, hostname_flags, + mudurl, info_only, privacy, NULL, diff --git a/src/dhcp/nm-dhcp-manager.h b/src/dhcp/nm-dhcp-manager.h index 1b793c22f8..516c326821 100644 --- a/src/dhcp/nm-dhcp-manager.h +++ b/src/dhcp/nm-dhcp-manager.h @@ -43,6 +43,7 @@ NMDhcpClient * nm_dhcp_manager_start_ip4 (NMDhcpManager *manager, const char *dhcp_hostname, const char *dhcp_fqdn, NMDhcpHostnameFlags hostname_flags, + const char *mudurl, GBytes *dhcp_client_id, guint32 timeout, const char *dhcp_anycast_addr, @@ -62,6 +63,7 @@ NMDhcpClient * nm_dhcp_manager_start_ip6 (NMDhcpManager *manager, gboolean send_hostname, const char *dhcp_hostname, NMDhcpHostnameFlags hostname_flags, + const char *mudurl, GBytes *duid, gboolean enforce_duid, guint32 iaid, diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/dhcp/nm-dhcp-nettools.c index 00b416da3a..75eff17a23 100644 --- a/src/dhcp/nm-dhcp-nettools.c +++ b/src/dhcp/nm-dhcp-nettools.c @@ -1285,6 +1285,7 @@ ip4_start (NMDhcpClient *client, gs_free char *lease_file = NULL; struct in_addr last_addr = { 0 }; const char *hostname; + const char *mudurl; int r, i; g_return_val_if_fail (!priv->probe, FALSE); @@ -1341,6 +1342,15 @@ ip4_start (NMDhcpClient *client, } } + mudurl = nm_dhcp_client_get_mudurl (client); + if (mudurl) { + r = n_dhcp4_client_probe_config_append_option (config, + NM_DHCP_OPTION_DHCP4_MUDURL, mudurl, strlen (mudurl)); + if ( r ) { + nm_utils_error_set_errno (error, r, + "failed to set MUD URL: %s"); + } + } hostname = nm_dhcp_client_get_hostname (client); if (hostname) { if (nm_dhcp_client_get_use_fqdn (client)) { diff --git a/src/dhcp/nm-dhcp-options.c b/src/dhcp/nm-dhcp-options.c index 1d391f3e9c..3f677e4441 100644 --- a/src/dhcp/nm-dhcp-options.c +++ b/src/dhcp/nm-dhcp-options.c @@ -126,6 +126,7 @@ const NMDhcpOption _nm_dhcp_option_dhcp4_options[] = { REQ (NM_DHCP_OPTION_DHCP4_TFTP_SERVER_ADDRESS, "tftp_server_address", FALSE ), REQ (NM_DHCP_OPTION_DHCP4_V4_PORTPARAMS, "v4_portparams", FALSE ), REQ (NM_DHCP_OPTION_DHCP4_V4_CAPTIVE_PORTAL, "v4_captive_portal", FALSE ), + REQ (NM_DHCP_OPTION_DHCP4_MUDURL, "mud_url", FALSE ), REQ (NM_DHCP_OPTION_DHCP4_LOADER_CONFIGFILE, "loader_configfile", FALSE ), REQ (NM_DHCP_OPTION_DHCP4_LOADER_PATHPREFIX, "loader_pathprefix", FALSE ), REQ (NM_DHCP_OPTION_DHCP4_LOADER_REBOOTTIME, "loader_reboottime", FALSE ), @@ -182,7 +183,7 @@ const NMDhcpOption _nm_dhcp_option_dhcp6_options[] = { REQ (NM_DHCP_OPTION_DHCP6_DNS_SERVERS, "dhcp6_name_servers", TRUE ), REQ (NM_DHCP_OPTION_DHCP6_DOMAIN_LIST, "dhcp6_domain_search", TRUE ), REQ (NM_DHCP_OPTION_DHCP6_SNTP_SERVERS, "dhcp6_sntp_servers", TRUE ), - + REQ (NM_DHCP_OPTION_DHCP6_MUDURL, "dhcp6_mud_url", FALSE ), /* Internal values */ REQ (NM_DHCP_OPTION_DHCP6_NM_IP_ADDRESS, "ip6_address", FALSE ), REQ (NM_DHCP_OPTION_DHCP6_NM_PREFIXLEN, "ip6_prefixlen", FALSE ), diff --git a/src/dhcp/nm-dhcp-options.h b/src/dhcp/nm-dhcp-options.h index bf9ccd5719..d8995e1045 100644 --- a/src/dhcp/nm-dhcp-options.h +++ b/src/dhcp/nm-dhcp-options.h @@ -110,6 +110,7 @@ typedef enum { NM_DHCP_OPTION_DHCP4_TFTP_SERVER_ADDRESS = 150, NM_DHCP_OPTION_DHCP4_V4_PORTPARAMS = 159, NM_DHCP_OPTION_DHCP4_V4_CAPTIVE_PORTAL = 160, + NM_DHCP_OPTION_DHCP4_MUDURL = 161, NM_DHCP_OPTION_DHCP4_LOADER_CONFIGFILE = 209, NM_DHCP_OPTION_DHCP4_LOADER_PATHPREFIX = 210, NM_DHCP_OPTION_DHCP4_LOADER_REBOOTTIME = 211, @@ -159,6 +160,7 @@ typedef enum { NM_DHCP_OPTION_DHCP6_DNS_SERVERS = 23, NM_DHCP_OPTION_DHCP6_DOMAIN_LIST = 24, NM_DHCP_OPTION_DHCP6_SNTP_SERVERS = 31, + NM_DHCP_OPTION_DHCP6_MUDURL = 112, /* Internal values */ NM_DHCP_OPTION_DHCP6_NM_IP_ADDRESS = 1026, NM_DHCP_OPTION_DHCP6_NM_PREFIXLEN = 1027, diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c index 23862e9e9b..4d3eee7711 100644 --- a/src/dhcp/nm-dhcp-systemd.c +++ b/src/dhcp/nm-dhcp-systemd.c @@ -573,6 +573,7 @@ ip4_start (NMDhcpClient *client, size_t client_id_len; struct in_addr last_addr = { 0 }; const char *hostname; + const char *mudurl; int r, i; g_return_val_if_fail (!priv->client4, FALSE); @@ -688,6 +689,16 @@ ip4_start (NMDhcpClient *client, } } + mudurl = nm_dhcp_client_get_mudurl (client); + + if ( mudurl ) { + r = sd_dhcp_client_set_mud_url (sd_client, mudurl); + if (r < 0) { + nm_utils_error_set_errno (error, r, "failed to set DHCP MUDURL: %s"); + return FALSE; + } + } + r = sd_dhcp_client_set_callback (sd_client, dhcp_event_cb, client); if (r < 0) { nm_utils_error_set_errno (error, r, "failed to set callback: %s"); diff --git a/src/dhcp/tests/test-dhcp-dhclient.c b/src/dhcp/tests/test-dhcp-dhclient.c index 761f9cdba6..a5d89e0a76 100644 --- a/src/dhcp/tests/test-dhcp-dhclient.c +++ b/src/dhcp/tests/test-dhcp-dhclient.c @@ -21,6 +21,7 @@ #include "nm-test-utils-core.h" #define TEST_DIR NM_BUILD_SRCDIR"/src/dhcp/tests" +#define TEST_MUDURL "https://example.com/mud.json" static void test_config (const char *orig, @@ -33,7 +34,8 @@ test_config (const char *orig, const char *dhcp_client_id, GBytes *expected_new_client_id, const char *iface, - const char *anycast_addr) + const char *anycast_addr, + const char *mudurl) { gs_free char *new = NULL; gs_unref_bytes GBytes *client_id = NULL; @@ -52,6 +54,7 @@ test_config (const char *orig, timeout, use_fqdn, hostname_flags, + mudurl, "/path/to/dhclient.conf", orig, &new_client_id); @@ -100,7 +103,37 @@ test_orig_missing (void) orig_missing_expected, AF_INET, NULL, 0, FALSE, NM_DHCP_HOSTNAME_FLAG_NONE, - NULL, NULL, "eth0", NULL); + NULL, NULL, "eth0", NULL, NULL); +} + +/*****************************************************************************/ + + +static const char *orig_missing_add_mudurl_expected = \ + "# Created by NetworkManager\n" + "\n" + "option mudurl code 161 = text;\n" + "send mudurl \"https://example.com/mud.json\";\n\n" + "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n" + "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n" + "option wpad code 252 = string;\n" + "\n" + "also request rfc3442-classless-static-routes;\n" + "also request ms-classless-static-routes;\n" + "also request static-routes;\n" + "also request wpad;\n" + "also request ntp-servers;\n" + "also request root-path;\n" + "\n"; + +static void +test_orig_missing_add_mudurl (void) +{ + test_config (NULL, + orig_missing_add_mudurl_expected, + AF_INET, NULL, 0, FALSE, + NM_DHCP_HOSTNAME_FLAG_NONE, + NULL, NULL, "eth0", NULL, TEST_MUDURL); } /*****************************************************************************/ @@ -135,6 +168,7 @@ test_override_client_id (void) "11:22:33:44:55:66", NULL, "eth0", + NULL, NULL); } @@ -166,6 +200,7 @@ test_quote_client_id (void) "abcd", NULL, "eth0", + NULL, NULL); } @@ -197,6 +232,7 @@ test_quote_client_id_2 (void) "a\\bc", NULL, "eth0", + NULL, NULL); } @@ -228,6 +264,7 @@ test_hex_zero_client_id (void) "00:11:22:33", NULL, "eth0", + NULL, NULL); } @@ -259,6 +296,7 @@ test_ascii_client_id (void) "qb:cd:ef:12:34:56", NULL, "eth0", + NULL, NULL); } @@ -290,6 +328,7 @@ test_hex_single_client_id (void) "ab:cd:e:12:34:56", NULL, "eth0", + NULL, NULL); } @@ -329,6 +368,7 @@ test_existing_hex_client_id (void) NULL, new_client_id, "eth0", + NULL, NULL); } @@ -367,6 +407,7 @@ test_existing_escaped_client_id (void) NULL, new_client_id, "eth0", + NULL, NULL); } @@ -409,6 +450,7 @@ test_existing_ascii_client_id (void) NULL, new_client_id, "eth0", + NULL, NULL); } /*****************************************************************************/ @@ -443,6 +485,7 @@ test_fqdn (void) NULL, NULL, "eth0", + NULL, NULL); } @@ -486,6 +529,7 @@ test_fqdn_options_override (void) TRUE, NULL, NULL, "eth0", + NULL, NULL); } @@ -521,6 +565,7 @@ test_override_hostname (void) NULL, NULL, "eth0", + NULL, NULL); } @@ -550,6 +595,7 @@ test_override_hostname6 (void) NULL, NULL, "eth0", + NULL, NULL); } @@ -576,6 +622,7 @@ test_nonfqdn_hostname6 (void) NULL, NULL, "eth0", + NULL, NULL); } @@ -613,6 +660,7 @@ test_existing_alsoreq (void) NULL, NULL, "eth0", + NULL, NULL); } @@ -653,6 +701,7 @@ test_existing_req (void) NULL, NULL, "eth0", + NULL, NULL); } @@ -694,6 +743,7 @@ test_existing_multiline_alsoreq (void) NULL, NULL, "eth0", + NULL, NULL); } @@ -934,6 +984,7 @@ test_interface1 (void) NULL, NULL, "eth0", + NULL, NULL); } @@ -981,6 +1032,7 @@ test_interface2 (void) NULL, NULL, "eth1", + NULL, NULL); } @@ -1093,6 +1145,7 @@ test_structured (void) NULL, new_client_id, "eth0", + NULL, NULL); } @@ -1149,6 +1202,7 @@ test_config_req_intf (void) NULL, NULL, "eth0", + NULL, NULL); } @@ -1162,6 +1216,7 @@ main (int argc, char **argv) nmtst_init_with_logging (&argc, &argv, NULL, "DEFAULT"); g_test_add_func ("/dhcp/dhclient/orig_missing", test_orig_missing); + g_test_add_func ("/dhcp/dhclient/orig_missing_add_mudurl", test_orig_missing_add_mudurl); g_test_add_func ("/dhcp/dhclient/override_client_id", test_override_client_id); g_test_add_func ("/dhcp/dhclient/quote_client_id/1", test_quote_client_id); g_test_add_func ("/dhcp/dhclient/quote_client_id/2", test_quote_client_id_2); diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c index fdc0d4a4ac..6320e722c0 100644 --- a/src/nm-iface-helper.c +++ b/src/nm-iface-helper.c @@ -64,6 +64,7 @@ static struct { char *dhcp4_clientid; char *dhcp4_hostname; char *dhcp4_fqdn; + char *mud_url; char *iid_str; NMSettingIP6ConfigAddrGenMode addr_gen_mode; char *logging_backend; @@ -523,6 +524,7 @@ main (int argc, char *argv[]) global_opt.dhcp4_hostname, global_opt.dhcp4_fqdn, NM_DHCP_HOSTNAME_FLAGS_FQDN_DEFAULT_IP4, + global_opt.mud_url, client_id, NM_DHCP_TIMEOUT_DEFAULT, NULL, 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 8e15341238..a16d9de0f7 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c @@ -582,6 +582,11 @@ make_connection_setting (const char *file, g_object_set (s_con, NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT, (int) vint64, NULL); } + nm_clear_g_free (&value); + v = svGetValueStr (ifcfg, "MUD_URL", &value); + if (v) + g_object_set (s_con, NM_SETTING_CONNECTION_MUD_URL, v, NULL); + i_val = NM_SETTING_CONNECTION_MDNS_DEFAULT; if (!svGetValueEnum (ifcfg, "MDNS", nm_setting_connection_mdns_get_type (), @@ -2204,6 +2209,7 @@ make_ip6_setting (shvarFile *ifcfg, if (v && !strchr (v, '.')) v = NULL; } + if (v) g_object_set (s_ip6, NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, v, NULL); diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c index d324361756..92e49caa51 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c @@ -893,6 +893,7 @@ const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[] = { _KEY_TYPE ("METRIC", NMS_IFCFG_KEY_TYPE_IS_NUMBERED ), _KEY_TYPE ("MODE", NMS_IFCFG_KEY_TYPE_IS_PLAIN ), _KEY_TYPE ("MTU", NMS_IFCFG_KEY_TYPE_IS_PLAIN ), + _KEY_TYPE ("MUD_URL", NMS_IFCFG_KEY_TYPE_IS_PLAIN ), _KEY_TYPE ("MULTI_CONNECT", NMS_IFCFG_KEY_TYPE_IS_PLAIN ), _KEY_TYPE ("MVRP", NMS_IFCFG_KEY_TYPE_IS_PLAIN ), _KEY_TYPE ("NAME", NMS_IFCFG_KEY_TYPE_IS_PLAIN ), diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h index 056d03fabe..25a5c0ac73 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h @@ -33,7 +33,8 @@ typedef struct { NMSIfcfgKeyTypeFlags key_flags; } NMSIfcfgKeyTypeInfo; -extern const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[232]; +/* maybe think about getting rid of the fixed number below at some point.*/ +extern const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[233]; const NMSIfcfgKeyTypeInfo *nms_ifcfg_well_known_key_find_info (const char *key, gssize *out_idx); 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 a0797fdc79..1fd29480d2 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c @@ -1792,7 +1792,7 @@ write_connection_setting (NMSettingConnection *s_con, shvarFile *ifcfg) NMSettingConnectionMdns mdns; NMSettingConnectionLlmnr llmnr; guint32 vuint32; - const char *tmp; + const char *tmp, *mud_url; svSetValueStr (ifcfg, "NAME", nm_setting_connection_get_id (s_con)); svSetValueStr (ifcfg, "UUID", nm_setting_connection_get_uuid (s_con)); @@ -1867,6 +1867,9 @@ write_connection_setting (NMSettingConnection *s_con, shvarFile *ifcfg) svSetValueStr (ifcfg, "TEAM_MASTER_UUID", NULL); svSetValueStr (ifcfg, "TEAM_MASTER", NULL); + mud_url = nm_setting_connection_get_mud_url (s_con); + svSetValueStr (ifcfg, "MUD_URL", mud_url); + master = nm_setting_connection_get_master (s_con); if (master) { /* The reader prefers the *_UUID variants, however we still try to resolve -- cgit v1.2.1 From ce282fa3f7208f50ff3a8de4d89e05d20e247e2c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 24 Apr 2020 09:16:46 +0200 Subject: systemd: make string argument of sd_dhcp6_client_set_request_mud_url() const See-also: https://github.com/systemd/systemd/pull/15586 --- src/systemd/src/libsystemd-network/sd-dhcp6-client.c | 2 +- src/systemd/src/systemd/sd-dhcp6-client.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c index 826ad56a9f..02ebb0c201 100644 --- a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c @@ -371,7 +371,7 @@ int sd_dhcp6_client_set_request_option(sd_dhcp6_client *client, uint16_t option) return 0; } -int sd_dhcp6_client_set_request_mud_url(sd_dhcp6_client *client, char *mudurl) { +int sd_dhcp6_client_set_request_mud_url(sd_dhcp6_client *client, const char *mudurl) { assert_return(client, -EINVAL); assert_return(client->state == DHCP6_STATE_STOPPED, -EBUSY); diff --git a/src/systemd/src/systemd/sd-dhcp6-client.h b/src/systemd/src/systemd/sd-dhcp6-client.h index 42d4ec752c..091f8287ec 100644 --- a/src/systemd/src/systemd/sd-dhcp6-client.h +++ b/src/systemd/src/systemd/sd-dhcp6-client.h @@ -123,7 +123,7 @@ int sd_dhcp6_client_set_request_option( uint16_t option); int sd_dhcp6_client_set_request_mud_url( sd_dhcp6_client *client, - char *mudurl); + const char *mudurl); int sd_dhcp6_client_set_prefix_delegation_hint( sd_dhcp6_client *client, uint8_t prefixlen, -- cgit v1.2.1 From 468c2e01abc111d21fc3dc2e46bbd079b00a1604 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 24 Apr 2020 09:35:12 +0200 Subject: systemd: add nm_sd_http_url_is_valid() to access internal http_url_is_valid() --- shared/systemd/nm-sd-utils-shared.c | 38 ++++++++++++++++++++++++++++++++++++ shared/systemd/nm-sd-utils-shared.h | 4 ++++ shared/systemd/src/shared/web-util.c | 34 ++++++++++++++++++-------------- 3 files changed, 61 insertions(+), 15 deletions(-) diff --git a/shared/systemd/nm-sd-utils-shared.c b/shared/systemd/nm-sd-utils-shared.c index 85fd6a353e..b4e017c94b 100644 --- a/shared/systemd/nm-sd-utils-shared.c +++ b/shared/systemd/nm-sd-utils-shared.c @@ -13,6 +13,7 @@ #include "hexdecoct.h" #include "hostname-util.h" #include "path-util.h" +#include "web-util.h" /*****************************************************************************/ @@ -94,3 +95,40 @@ gboolean nm_sd_hostname_is_valid (const char *s, bool allow_trailing_dot) { return hostname_is_valid (s, allow_trailing_dot); } + +/*****************************************************************************/ + +static gboolean +_http_url_is_valid (const char *url) +{ + if ( !url + || !url[0]) + return FALSE; + + if (NM_STR_HAS_PREFIX (url, "http://")) + url += NM_STRLEN ("http://"); + else if (NM_STR_HAS_PREFIX (url, "https://")) + url += NM_STRLEN ("https://"); + else + return FALSE; + + if (!url[0]) + return FALSE; + + return !NM_STRCHAR_ANY (url, ch, (guchar) ch >= 128u); +} + +gboolean +nm_sd_http_url_is_valid (const char *url) +{ + gboolean v; + + /* http_url_is_valid() is part of our API, as we use it to validate connection + * properties. That means, it's behavior must remain stable (or only change + * with care). + * + * Thus, reimplement it, and make sure that our implementation agrees. */ + v = _http_url_is_valid (url); + nm_assert (v == http_url_is_valid (url)); + return v; +} diff --git a/shared/systemd/nm-sd-utils-shared.h b/shared/systemd/nm-sd-utils-shared.h index 3495a31d19..382db278d1 100644 --- a/shared/systemd/nm-sd-utils-shared.h +++ b/shared/systemd/nm-sd-utils-shared.h @@ -34,4 +34,8 @@ int nm_sd_dns_name_to_wire_format (const char *domain, int nm_sd_dns_name_is_valid (const char *s); gboolean nm_sd_hostname_is_valid(const char *s, bool allow_trailing_dot); +/*****************************************************************************/ + +gboolean nm_sd_http_url_is_valid (const char *url); + #endif /* __NM_SD_UTILS_SHARED_H__ */ diff --git a/shared/systemd/src/shared/web-util.c b/shared/systemd/src/shared/web-util.c index f5a5362bd5..4cff5e271d 100644 --- a/shared/systemd/src/shared/web-util.c +++ b/shared/systemd/src/shared/web-util.c @@ -24,21 +24,25 @@ bool http_etag_is_valid(const char *etag) { } #endif /* NM_IGNORED */ -bool http_url_is_valid(const char *url) { - const char *p; - - if (isempty(url)) - return false; - - p = STARTSWITH_SET(url, "http://", "https://"); - if (!p) - return false; - - if (isempty(p)) - return false; - - return ascii_is_valid(p); -} +/* NM: we use http_url_is_valid() for our own code, and it must not + * change behavior. If a re-import results in a merge-conflict, you must + * ensure that it does not change behavior, and possibly do something + * about that. */ +/**/ bool http_url_is_valid(const char *url) { +/**/ const char *p; +/**/ +/**/ if (isempty(url)) +/**/ return false; +/**/ +/**/ p = STARTSWITH_SET(url, "http://", "https://"); +/**/ if (!p) +/**/ return false; +/**/ +/**/ if (isempty(p)) +/**/ return false; +/**/ +/**/ return ascii_is_valid(p); +/**/ } #if 0 /* NM_IGNORED */ bool documentation_url_is_valid(const char *url) { -- cgit v1.2.1 From db645623eedf55bd7ad612cb77c73f8e22a1fe34 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 24 Apr 2020 08:12:24 +0200 Subject: dhcp: rename mudurl to mud_url --- libnm-core/nm-setting-connection.c | 1 - src/dhcp/nm-dhcp-client.c | 20 +++++++++--------- src/dhcp/nm-dhcp-client.h | 4 ++-- src/dhcp/nm-dhcp-dhclient-utils.c | 24 +++++++++++----------- src/dhcp/nm-dhcp-dhclient-utils.h | 2 +- src/dhcp/nm-dhcp-dhclient.c | 12 +++++------ src/dhcp/nm-dhcp-manager.c | 12 +++++------ src/dhcp/nm-dhcp-manager.h | 4 ++-- src/dhcp/nm-dhcp-nettools.c | 16 ++++++++------- src/dhcp/nm-dhcp-options.c | 5 +++-- src/dhcp/nm-dhcp-options.h | 4 ++-- src/dhcp/nm-dhcp-systemd.c | 9 ++++---- src/dhcp/tests/test-dhcp-dhclient.c | 12 +++++------ .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 1 - 14 files changed, 63 insertions(+), 63 deletions(-) diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c index 7fa768623c..db05caf633 100644 --- a/libnm-core/nm-setting-connection.c +++ b/libnm-core/nm-setting-connection.c @@ -768,7 +768,6 @@ nm_setting_connection_get_mud_url (NMSettingConnection *setting) return NM_SETTING_CONNECTION_GET_PRIVATE (setting)->mud_url; } - /** * nm_setting_connection_add_secondary: * @setting: the #NMSettingConnection diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c index b3c9fa88f5..8e50a8f99f 100644 --- a/src/dhcp/nm-dhcp-client.c +++ b/src/dhcp/nm-dhcp-client.c @@ -50,7 +50,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMDhcpClient, PROP_IAID_EXPLICIT, PROP_HOSTNAME, PROP_HOSTNAME_FLAGS, - PROP_MUDURL, + PROP_MUD_URL, ); typedef struct _NMDhcpClientPrivate { @@ -61,7 +61,7 @@ typedef struct _NMDhcpClientPrivate { char * uuid; GBytes * client_id; char * hostname; - char * mudurl; + char * mud_url; pid_t pid; guint timeout_id; guint watch_id; @@ -315,11 +315,11 @@ nm_dhcp_client_get_use_fqdn (NMDhcpClient *self) } const char * -nm_dhcp_client_get_mudurl (NMDhcpClient *self) +nm_dhcp_client_get_mud_url (NMDhcpClient *self) { g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), NULL); - return NM_DHCP_CLIENT_GET_PRIVATE (self)->mudurl; + return NM_DHCP_CLIENT_GET_PRIVATE (self)->mud_url; } /*****************************************************************************/ @@ -980,8 +980,8 @@ get_property (GObject *object, guint prop_id, case PROP_HOSTNAME: g_value_set_string (value, priv->hostname); break; - case PROP_MUDURL: - g_value_set_string (value, priv->mudurl); + case PROP_MUD_URL: + g_value_set_string (value, priv->mud_url); break; case PROP_ROUTE_METRIC: g_value_set_uint (value, priv->route_metric); @@ -1065,9 +1065,9 @@ set_property (GObject *object, guint prop_id, /* construct-only */ priv->hostname_flags = g_value_get_uint (value); break; - case PROP_MUDURL: + case PROP_MUD_URL: /* construct-only */ - priv->mudurl = g_value_dup_string (value); + priv->mud_url = g_value_dup_string (value); break; case PROP_ROUTE_TABLE: priv->route_table = g_value_get_uint (value); @@ -1208,8 +1208,8 @@ nm_dhcp_client_class_init (NMDhcpClientClass *client_class) G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); - obj_properties[PROP_MUDURL] = - g_param_spec_string (NM_DHCP_CLIENT_MUDURL, "", "", + obj_properties[PROP_MUD_URL] = + g_param_spec_string (NM_DHCP_CLIENT_MUD_URL, "", "", NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); diff --git a/src/dhcp/nm-dhcp-client.h b/src/dhcp/nm-dhcp-client.h index eb49488ede..479ea000a9 100644 --- a/src/dhcp/nm-dhcp-client.h +++ b/src/dhcp/nm-dhcp-client.h @@ -30,7 +30,7 @@ #define NM_DHCP_CLIENT_INTERFACE "iface" #define NM_DHCP_CLIENT_MULTI_IDX "multi-idx" #define NM_DHCP_CLIENT_HOSTNAME "hostname" -#define NM_DHCP_CLIENT_MUDURL "mudurl" +#define NM_DHCP_CLIENT_MUD_URL "mud-url" #define NM_DHCP_CLIENT_ROUTE_METRIC "route-metric" #define NM_DHCP_CLIENT_ROUTE_TABLE "route-table" #define NM_DHCP_CLIENT_TIMEOUT "timeout" @@ -142,7 +142,7 @@ gboolean nm_dhcp_client_get_iaid_explicit (NMDhcpClient *self); GBytes *nm_dhcp_client_get_client_id (NMDhcpClient *self); const char *nm_dhcp_client_get_hostname (NMDhcpClient *self); -const char *nm_dhcp_client_get_mudurl (NMDhcpClient *self); +const char *nm_dhcp_client_get_mud_url (NMDhcpClient *self); NMDhcpHostnameFlags nm_dhcp_client_get_hostname_flags (NMDhcpClient *self); diff --git a/src/dhcp/nm-dhcp-dhclient-utils.c b/src/dhcp/nm-dhcp-dhclient-utils.c index bc80b54e77..76fc1a898d 100644 --- a/src/dhcp/nm-dhcp-dhclient-utils.c +++ b/src/dhcp/nm-dhcp-dhclient-utils.c @@ -190,19 +190,19 @@ add_hostname6 (GString *str, } } -static void add_mudurl_config(GString *str, const char *mudurl, int addr_family) { - if (mudurl) { - if (addr_family == AF_INET) { - g_string_append (str, MUDURLv4_DEF); - g_string_append_printf (str, MUDURLv4_FMT, mudurl); +static void add_mud_url_config(GString *str, const char *mud_url, int addr_family) +{ + if (mud_url) { + if (addr_family == AF_INET) { + g_string_append (str, MUDURLv4_DEF); + g_string_append_printf (str, MUDURLv4_FMT, mud_url); } else { - g_string_append (str, MUDURLv6_DEF); - g_string_append_printf (str, MUDURLv6_FMT, mudurl); + g_string_append (str, MUDURLv6_DEF); + g_string_append_printf (str, MUDURLv6_FMT, mud_url); } } } - static GBytes * read_client_id (const char *str) { @@ -306,7 +306,7 @@ nm_dhcp_dhclient_create_config (const char *interface, guint32 timeout, gboolean use_fqdn, NMDhcpHostnameFlags hostname_flags, - const char *mudurl, + const char *mud_url, const char *orig_path, const char *orig_contents, GBytes **out_new_client_id) @@ -472,9 +472,9 @@ nm_dhcp_dhclient_create_config (const char *interface, g_string_append_printf (new_contents, "timeout %u;\n", timeout); } - add_mudurl_config(new_contents,mudurl,addr_family); + add_mud_url_config (new_contents, mud_url, addr_family); if (addr_family == AF_INET) { - add_ip4_config (new_contents, client_id, hostname, use_fqdn, hostname_flags); + add_ip4_config (new_contents, client_id, hostname, use_fqdn, hostname_flags); add_request (reqs, "rfc3442-classless-static-routes"); add_request (reqs, "ms-classless-static-routes"); add_request (reqs, "static-routes"); @@ -482,7 +482,7 @@ nm_dhcp_dhclient_create_config (const char *interface, add_request (reqs, "ntp-servers"); add_request (reqs, "root-path"); } else { - add_hostname6 (new_contents, hostname, hostname_flags); + add_hostname6 (new_contents, hostname, hostname_flags); add_request (reqs, "dhcp6.name-servers"); add_request (reqs, "dhcp6.domain-search"); diff --git a/src/dhcp/nm-dhcp-dhclient-utils.h b/src/dhcp/nm-dhcp-dhclient-utils.h index 20ea8d6852..5094d614e6 100644 --- a/src/dhcp/nm-dhcp-dhclient-utils.h +++ b/src/dhcp/nm-dhcp-dhclient-utils.h @@ -17,7 +17,7 @@ char *nm_dhcp_dhclient_create_config (const char *interface, guint32 timeout, gboolean use_fqdn, NMDhcpHostnameFlags hostname_flags, - const char *mudurl, + const char *mud_url, const char *orig_path, const char *orig_contents, GBytes **out_new_client_id); diff --git a/src/dhcp/nm-dhcp-dhclient.c b/src/dhcp/nm-dhcp-dhclient.c index 5075702254..4ad056e548 100644 --- a/src/dhcp/nm-dhcp-dhclient.c +++ b/src/dhcp/nm-dhcp-dhclient.c @@ -147,7 +147,7 @@ merge_dhclient_config (NMDhcpDhclient *self, guint32 timeout, gboolean use_fqdn, NMDhcpHostnameFlags hostname_flags, - const char *mudurl, + const char *mud_url, const char *orig_path, GBytes **out_new_client_id, GError **error) @@ -177,7 +177,7 @@ merge_dhclient_config (NMDhcpDhclient *self, timeout, use_fqdn, hostname_flags, - mudurl, + mud_url, orig_path, orig, out_new_client_id); @@ -270,7 +270,7 @@ create_dhclient_config (NMDhcpDhclient *self, guint32 timeout, gboolean use_fqdn, NMDhcpHostnameFlags hostname_flags, - const char *mudurl, + const char *mud_url, GBytes **out_new_client_id) { gs_free char *orig = NULL; @@ -299,7 +299,7 @@ create_dhclient_config (NMDhcpDhclient *self, timeout, use_fqdn, hostname_flags, - mudurl, + mud_url, orig, out_new_client_id, &error)) { @@ -500,7 +500,7 @@ ip4_start (NMDhcpClient *client, nm_dhcp_client_get_timeout (client), nm_dhcp_client_get_use_fqdn (client), nm_dhcp_client_get_hostname_flags (client), - nm_dhcp_client_get_mudurl (client), + nm_dhcp_client_get_mud_url (client), &new_client_id); if (!priv->conf_file) { nm_utils_error_set_literal (error, @@ -545,7 +545,7 @@ ip6_start (NMDhcpClient *client, nm_dhcp_client_get_timeout (client), TRUE, nm_dhcp_client_get_hostname_flags (client), - nm_dhcp_client_get_mudurl (client), + nm_dhcp_client_get_mud_url (client), NULL); if (!priv->conf_file) { nm_utils_error_set_literal (error, diff --git a/src/dhcp/nm-dhcp-manager.c b/src/dhcp/nm-dhcp-manager.c index 273e229a94..7565bfc8c6 100644 --- a/src/dhcp/nm-dhcp-manager.c +++ b/src/dhcp/nm-dhcp-manager.c @@ -220,7 +220,7 @@ client_start (NMDhcpManager *self, const char *hostname, gboolean hostname_use_fqdn, NMDhcpHostnameFlags hostname_flags, - const char *mudurl, + const char *mud_url, gboolean info_only, NMSettingIP6ConfigPrivacy privacy, const char *last_ip4_address, @@ -304,7 +304,7 @@ client_start (NMDhcpManager *self, NM_DHCP_CLIENT_IAID, (guint) iaid, NM_DHCP_CLIENT_IAID_EXPLICIT, iaid_explicit, NM_DHCP_CLIENT_HOSTNAME, hostname, - NM_DHCP_CLIENT_MUDURL, mudurl, + NM_DHCP_CLIENT_MUD_URL, mud_url, NM_DHCP_CLIENT_ROUTE_TABLE, (guint) route_table, NM_DHCP_CLIENT_ROUTE_METRIC, (guint) route_metric, NM_DHCP_CLIENT_TIMEOUT, (guint) timeout, @@ -384,7 +384,7 @@ nm_dhcp_manager_start_ip4 (NMDhcpManager *self, const char *dhcp_hostname, const char *dhcp_fqdn, NMDhcpHostnameFlags hostname_flags, - const char *mudurl, + const char *mud_url, GBytes *dhcp_client_id, guint32 timeout, const char *dhcp_anycast_addr, @@ -443,7 +443,7 @@ nm_dhcp_manager_start_ip4 (NMDhcpManager *self, hostname, use_fqdn, hostname_flags, - mudurl, + mud_url, FALSE, 0, last_ip_address, @@ -466,7 +466,7 @@ nm_dhcp_manager_start_ip6 (NMDhcpManager *self, gboolean send_hostname, const char *dhcp_hostname, NMDhcpHostnameFlags hostname_flags, - const char *mudurl, + const char *mud_url, GBytes *duid, gboolean enforce_duid, guint32 iaid, @@ -508,7 +508,7 @@ nm_dhcp_manager_start_ip6 (NMDhcpManager *self, hostname, TRUE, hostname_flags, - mudurl, + mud_url, info_only, privacy, NULL, diff --git a/src/dhcp/nm-dhcp-manager.h b/src/dhcp/nm-dhcp-manager.h index 516c326821..88435282e3 100644 --- a/src/dhcp/nm-dhcp-manager.h +++ b/src/dhcp/nm-dhcp-manager.h @@ -43,7 +43,7 @@ NMDhcpClient * nm_dhcp_manager_start_ip4 (NMDhcpManager *manager, const char *dhcp_hostname, const char *dhcp_fqdn, NMDhcpHostnameFlags hostname_flags, - const char *mudurl, + const char *mud_url, GBytes *dhcp_client_id, guint32 timeout, const char *dhcp_anycast_addr, @@ -63,7 +63,7 @@ NMDhcpClient * nm_dhcp_manager_start_ip6 (NMDhcpManager *manager, gboolean send_hostname, const char *dhcp_hostname, NMDhcpHostnameFlags hostname_flags, - const char *mudurl, + const char *mud_url, GBytes *duid, gboolean enforce_duid, guint32 iaid, diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/dhcp/nm-dhcp-nettools.c index 75eff17a23..e078cf39b2 100644 --- a/src/dhcp/nm-dhcp-nettools.c +++ b/src/dhcp/nm-dhcp-nettools.c @@ -1285,7 +1285,7 @@ ip4_start (NMDhcpClient *client, gs_free char *lease_file = NULL; struct in_addr last_addr = { 0 }; const char *hostname; - const char *mudurl; + const char *mud_url; int r, i; g_return_val_if_fail (!priv->probe, FALSE); @@ -1342,13 +1342,15 @@ ip4_start (NMDhcpClient *client, } } - mudurl = nm_dhcp_client_get_mudurl (client); - if (mudurl) { + mud_url = nm_dhcp_client_get_mud_url (client); + if (mud_url) { r = n_dhcp4_client_probe_config_append_option (config, - NM_DHCP_OPTION_DHCP4_MUDURL, mudurl, strlen (mudurl)); - if ( r ) { - nm_utils_error_set_errno (error, r, - "failed to set MUD URL: %s"); + NM_DHCP_OPTION_DHCP4_MUD_URL, + mud_url, + strlen (mud_url)); + if (r) { + nm_utils_error_set_errno (error, r, + "failed to set MUD URL: %s"); } } hostname = nm_dhcp_client_get_hostname (client); diff --git a/src/dhcp/nm-dhcp-options.c b/src/dhcp/nm-dhcp-options.c index 3f677e4441..b10635fc67 100644 --- a/src/dhcp/nm-dhcp-options.c +++ b/src/dhcp/nm-dhcp-options.c @@ -126,7 +126,7 @@ const NMDhcpOption _nm_dhcp_option_dhcp4_options[] = { REQ (NM_DHCP_OPTION_DHCP4_TFTP_SERVER_ADDRESS, "tftp_server_address", FALSE ), REQ (NM_DHCP_OPTION_DHCP4_V4_PORTPARAMS, "v4_portparams", FALSE ), REQ (NM_DHCP_OPTION_DHCP4_V4_CAPTIVE_PORTAL, "v4_captive_portal", FALSE ), - REQ (NM_DHCP_OPTION_DHCP4_MUDURL, "mud_url", FALSE ), + REQ (NM_DHCP_OPTION_DHCP4_MUD_URL, "mud_url", FALSE ), REQ (NM_DHCP_OPTION_DHCP4_LOADER_CONFIGFILE, "loader_configfile", FALSE ), REQ (NM_DHCP_OPTION_DHCP4_LOADER_PATHPREFIX, "loader_pathprefix", FALSE ), REQ (NM_DHCP_OPTION_DHCP4_LOADER_REBOOTTIME, "loader_reboottime", FALSE ), @@ -183,7 +183,8 @@ const NMDhcpOption _nm_dhcp_option_dhcp6_options[] = { REQ (NM_DHCP_OPTION_DHCP6_DNS_SERVERS, "dhcp6_name_servers", TRUE ), REQ (NM_DHCP_OPTION_DHCP6_DOMAIN_LIST, "dhcp6_domain_search", TRUE ), REQ (NM_DHCP_OPTION_DHCP6_SNTP_SERVERS, "dhcp6_sntp_servers", TRUE ), - REQ (NM_DHCP_OPTION_DHCP6_MUDURL, "dhcp6_mud_url", FALSE ), + REQ (NM_DHCP_OPTION_DHCP6_MUD_URL, "dhcp6_mud_url", FALSE ), + /* Internal values */ REQ (NM_DHCP_OPTION_DHCP6_NM_IP_ADDRESS, "ip6_address", FALSE ), REQ (NM_DHCP_OPTION_DHCP6_NM_PREFIXLEN, "ip6_prefixlen", FALSE ), diff --git a/src/dhcp/nm-dhcp-options.h b/src/dhcp/nm-dhcp-options.h index d8995e1045..7c0121702d 100644 --- a/src/dhcp/nm-dhcp-options.h +++ b/src/dhcp/nm-dhcp-options.h @@ -110,7 +110,7 @@ typedef enum { NM_DHCP_OPTION_DHCP4_TFTP_SERVER_ADDRESS = 150, NM_DHCP_OPTION_DHCP4_V4_PORTPARAMS = 159, NM_DHCP_OPTION_DHCP4_V4_CAPTIVE_PORTAL = 160, - NM_DHCP_OPTION_DHCP4_MUDURL = 161, + NM_DHCP_OPTION_DHCP4_MUD_URL = 161, NM_DHCP_OPTION_DHCP4_LOADER_CONFIGFILE = 209, NM_DHCP_OPTION_DHCP4_LOADER_PATHPREFIX = 210, NM_DHCP_OPTION_DHCP4_LOADER_REBOOTTIME = 211, @@ -160,7 +160,7 @@ typedef enum { NM_DHCP_OPTION_DHCP6_DNS_SERVERS = 23, NM_DHCP_OPTION_DHCP6_DOMAIN_LIST = 24, NM_DHCP_OPTION_DHCP6_SNTP_SERVERS = 31, - NM_DHCP_OPTION_DHCP6_MUDURL = 112, + NM_DHCP_OPTION_DHCP6_MUD_URL = 112, /* Internal values */ NM_DHCP_OPTION_DHCP6_NM_IP_ADDRESS = 1026, NM_DHCP_OPTION_DHCP6_NM_PREFIXLEN = 1027, diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c index 4d3eee7711..983f4e2a65 100644 --- a/src/dhcp/nm-dhcp-systemd.c +++ b/src/dhcp/nm-dhcp-systemd.c @@ -573,7 +573,7 @@ ip4_start (NMDhcpClient *client, size_t client_id_len; struct in_addr last_addr = { 0 }; const char *hostname; - const char *mudurl; + const char *mud_url; int r, i; g_return_val_if_fail (!priv->client4, FALSE); @@ -689,10 +689,9 @@ ip4_start (NMDhcpClient *client, } } - mudurl = nm_dhcp_client_get_mudurl (client); - - if ( mudurl ) { - r = sd_dhcp_client_set_mud_url (sd_client, mudurl); + mud_url = nm_dhcp_client_get_mud_url (client); + if (mud_url) { + r = sd_dhcp_client_set_mud_url (sd_client, mud_url); if (r < 0) { nm_utils_error_set_errno (error, r, "failed to set DHCP MUDURL: %s"); return FALSE; diff --git a/src/dhcp/tests/test-dhcp-dhclient.c b/src/dhcp/tests/test-dhcp-dhclient.c index a5d89e0a76..d51bcae5f8 100644 --- a/src/dhcp/tests/test-dhcp-dhclient.c +++ b/src/dhcp/tests/test-dhcp-dhclient.c @@ -35,7 +35,7 @@ test_config (const char *orig, GBytes *expected_new_client_id, const char *iface, const char *anycast_addr, - const char *mudurl) + const char *mud_url) { gs_free char *new = NULL; gs_unref_bytes GBytes *client_id = NULL; @@ -54,7 +54,7 @@ test_config (const char *orig, timeout, use_fqdn, hostname_flags, - mudurl, + mud_url, "/path/to/dhclient.conf", orig, &new_client_id); @@ -109,7 +109,7 @@ test_orig_missing (void) /*****************************************************************************/ -static const char *orig_missing_add_mudurl_expected = \ +static const char *orig_missing_add_mud_url_expected = \ "# Created by NetworkManager\n" "\n" "option mudurl code 161 = text;\n" @@ -127,10 +127,10 @@ static const char *orig_missing_add_mudurl_expected = \ "\n"; static void -test_orig_missing_add_mudurl (void) +test_orig_missing_add_mud_url (void) { test_config (NULL, - orig_missing_add_mudurl_expected, + orig_missing_add_mud_url_expected, AF_INET, NULL, 0, FALSE, NM_DHCP_HOSTNAME_FLAG_NONE, NULL, NULL, "eth0", NULL, TEST_MUDURL); @@ -1216,7 +1216,7 @@ main (int argc, char **argv) nmtst_init_with_logging (&argc, &argv, NULL, "DEFAULT"); g_test_add_func ("/dhcp/dhclient/orig_missing", test_orig_missing); - g_test_add_func ("/dhcp/dhclient/orig_missing_add_mudurl", test_orig_missing_add_mudurl); + g_test_add_func ("/dhcp/dhclient/orig_missing_add_mud_url", test_orig_missing_add_mud_url); g_test_add_func ("/dhcp/dhclient/override_client_id", test_override_client_id); g_test_add_func ("/dhcp/dhclient/quote_client_id/1", test_quote_client_id); g_test_add_func ("/dhcp/dhclient/quote_client_id/2", test_quote_client_id_2); 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 a16d9de0f7..ad5d45ac3a 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c @@ -2209,7 +2209,6 @@ make_ip6_setting (shvarFile *ifcfg, if (v && !strchr (v, '.')) v = NULL; } - if (v) g_object_set (s_ip6, NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, v, NULL); -- cgit v1.2.1 From a2956db2ee6eccbd6ee60a2dbc5752491a937d97 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 24 Apr 2020 08:18:35 +0200 Subject: dhcp: abort on error setting DHCP MUD URL option for nettools --- src/dhcp/nm-dhcp-nettools.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/dhcp/nm-dhcp-nettools.c index e078cf39b2..8b98447b10 100644 --- a/src/dhcp/nm-dhcp-nettools.c +++ b/src/dhcp/nm-dhcp-nettools.c @@ -1351,6 +1351,7 @@ ip4_start (NMDhcpClient *client, if (r) { nm_utils_error_set_errno (error, r, "failed to set MUD URL: %s"); + return FALSE; } } hostname = nm_dhcp_client_get_hostname (client); -- cgit v1.2.1 From 54e2c60d3440ee57baa968f841605ea43452c31e Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 24 Apr 2020 08:30:48 +0200 Subject: dhcp/nettools: cleanup setting error message from n-dhcp4 error code n-dhcp4 error codes can also be some positive numbers. Those shall not be converted to errno. Instead, print the error code directly. --- src/dhcp/nm-dhcp-nettools.c | 48 +++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/dhcp/nm-dhcp-nettools.c index 8b98447b10..46c72566ae 100644 --- a/src/dhcp/nm-dhcp-nettools.c +++ b/src/dhcp/nm-dhcp-nettools.c @@ -68,6 +68,20 @@ G_DEFINE_TYPE (NMDhcpNettools, nm_dhcp_nettools, NM_TYPE_DHCP_CLIENT) /*****************************************************************************/ +static void +set_error_nettools (GError **error, int r, const char *message) +{ + /* the error code returned from n_dhcp4_* API is either a negative + * errno, or a positive internal error code. Generate different messages + * for these. */ + if (r < 0) + nm_utils_error_set_errno (error, r, "%s: %s", message); + else + nm_utils_error_set (error, r, "%s (code %d)", message, r); +} + +/*****************************************************************************/ + #define DHCP_MAX_FQDN_LENGTH 255 enum { @@ -681,11 +695,10 @@ lease_parse_metered (NDhcp4ClientLease *lease, int r; r = n_dhcp4_client_lease_query (lease, NM_DHCP_OPTION_DHCP4_VENDOR_SPECIFIC, &data, &n_data); - if (r) { + if (r) metered = FALSE; - } else { + else metered = !!memmem (data, n_data, "ANDROID_METERED", NM_STRLEN ("ANDROID_METERED")); - } /* TODO: expose the vendor specific option when present */ nm_ip4_config_set_metered (ip4_config, metered); @@ -1023,9 +1036,8 @@ dhcp4_event_handle (NMDhcpNettools *self, case N_DHCP4_CLIENT_EVENT_OFFER: /* always accept the first lease */ r = n_dhcp4_client_lease_select (event->offer.lease); - if (r) { + if (r) _LOGW ("selecting lease failed: %d", r); - } break; case N_DHCP4_CLIENT_EVENT_RETRACTED: case N_DHCP4_CLIENT_EVENT_EXPIRED: @@ -1170,7 +1182,7 @@ nettools_create (NMDhcpNettools *self, r = n_dhcp4_client_config_new (&config); if (r) { - nm_utils_error_set_errno (error, r, "failed to create client-config: %s"); + set_error_nettools (error, r, "failed to create client-config"); return FALSE; } @@ -1184,13 +1196,13 @@ nettools_create (NMDhcpNettools *self, client_id_arr, NM_MIN (client_id_len, 1 + _NM_SD_MAX_CLIENT_ID_LEN)); if (r) { - nm_utils_error_set_errno (error, r, "failed to set client-id: %s"); + set_error_nettools (error, r, "failed to set client-id"); return FALSE; } r = n_dhcp4_client_new (&client, config); if (r) { - nm_utils_error_set (error, NM_UTILS_ERROR_UNKNOWN, "failed to create client: error %d", r); + set_error_nettools (error, r, "failed to create client"); return FALSE; } @@ -1224,7 +1236,7 @@ _accept (NMDhcpClient *client, r = n_dhcp4_client_lease_accept (priv->lease); if (r) { - nm_utils_error_set_errno (error, r, "failed to accept lease: %s"); + set_error_nettools (error, r, "failed to accept lease"); return FALSE; } @@ -1248,7 +1260,7 @@ decline (NMDhcpClient *client, r = n_dhcp4_client_lease_decline (priv->lease, error_message); if (r) { - nm_utils_error_set_errno (error, r, "failed to decline lease: %s"); + set_error_nettools (error, r, "failed to decline lease"); return FALSE; } @@ -1295,7 +1307,7 @@ ip4_start (NMDhcpClient *client, r = n_dhcp4_client_probe_config_new (&config); if (r) { - nm_utils_error_set_errno (error, r, "failed to create dhcp-client-probe-config: %s"); + set_error_nettools (error, r, "failed to create dhcp-client-probe-config"); return FALSE; } @@ -1349,8 +1361,7 @@ ip4_start (NMDhcpClient *client, mud_url, strlen (mud_url)); if (r) { - nm_utils_error_set_errno (error, r, - "failed to set MUD URL: %s"); + set_error_nettools (error, r, "failed to set MUD URL"); return FALSE; } } @@ -1372,7 +1383,10 @@ ip4_start (NMDhcpClient *client, sizeof (buffer) - 3, FALSE); if (r <= 0) { - nm_utils_error_set_errno (error, r, "failed to convert DHCP FQDN: %s"); + if (r < 0) + nm_utils_error_set_errno (error, r, "failed to convert DHCP FQDN: %s"); + else + nm_utils_error_set (error, r, "failed to convert DHCP FQDN"); return FALSE; } fqdn_len = r; @@ -1390,7 +1404,7 @@ ip4_start (NMDhcpClient *client, buffer, 3 + fqdn_len); if (r) { - nm_utils_error_set_errno (error, r, "failed to set DHCP FQDN: %s"); + set_error_nettools (error, r, "failed to set DHCP FQDN"); return FALSE; } } else { @@ -1399,7 +1413,7 @@ ip4_start (NMDhcpClient *client, hostname, strlen (hostname)); if (r) { - nm_utils_error_set_errno (error, r, "failed to set DHCP hostname: %s"); + set_error_nettools (error, r, "failed to set DHCP hostname"); return FALSE; } } @@ -1410,7 +1424,7 @@ ip4_start (NMDhcpClient *client, r = n_dhcp4_client_probe (priv->client, &priv->probe, config); if (r) { - nm_utils_error_set_errno (error, r, "failed to start DHCP client: %s"); + set_error_nettools (error, r, "failed to start DHCP client"); return FALSE; } -- cgit v1.2.1 From a058535b9d6b30506e6ec78806155e1befd9a0fd Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 24 Apr 2020 08:40:47 +0200 Subject: device: rename local variable s_connection and adjust assertions - avoid g_assert(). Either we want to gracefully assert (g_return_*()) or we want to use assertions that are disabled in production builds (nm_assert()); - rename variable s_connection to s_con. This is how variables for this purpose are commonly called. --- src/devices/nm-device.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 542b6371f6..9b97a35c18 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -8427,7 +8427,7 @@ dhcp4_start (NMDevice *self) gs_unref_bytes GBytes *bcast_hwaddr = NULL; gs_unref_bytes GBytes *client_id = NULL; NMConnection *connection; - NMSettingConnection *s_connection; + NMSettingConnection *s_con; GError *error = NULL; const NMPlatformLink *pllink; @@ -8436,8 +8436,8 @@ dhcp4_start (NMDevice *self) s_ip4 = nm_connection_get_setting_ip4_config (connection); - s_connection = nm_connection_get_setting_connection (connection); - nm_assert (s_connection); + s_con = nm_connection_get_setting_connection (connection); + nm_assert (s_con); /* Clear old exported DHCP options */ nm_dbus_object_clear_and_unexport (&priv->dhcp_data_4.config); @@ -8465,7 +8465,7 @@ dhcp4_start (NMDevice *self) nm_setting_ip_config_get_dhcp_hostname (s_ip4), nm_setting_ip4_config_get_dhcp_fqdn (NM_SETTING_IP4_CONFIG (s_ip4)), get_dhcp_hostname_flags (self, AF_INET), - nm_setting_connection_get_mud_url (s_connection), + nm_setting_connection_get_mud_url (s_con), client_id, get_dhcp_timeout (self, AF_INET), priv->dhcp_anycast_address, @@ -9216,14 +9216,15 @@ dhcp6_start_with_link_ready (NMDevice *self, NMConnection *connection) GError *error = NULL; guint32 iaid; gboolean iaid_explicit; - NMSettingConnection *s_connection; + NMSettingConnection *s_con; const NMPlatformIP6Address *ll_addr = NULL; - g_assert (connection); + g_return_val_if_fail (connection, FALSE); + s_ip6 = nm_connection_get_setting_ip6_config (connection); - g_assert (s_ip6); - s_connection = nm_connection_get_setting_connection (connection); - nm_assert (s_connection); + nm_assert (s_ip6); + s_con = nm_connection_get_setting_connection (connection); + nm_assert (s_con); if (priv->ext_ip6_config_captured) { ll_addr = nm_ip6_config_find_first_address (priv->ext_ip6_config_captured, @@ -9258,7 +9259,7 @@ dhcp6_start_with_link_ready (NMDevice *self, NMConnection *connection) nm_setting_ip_config_get_dhcp_send_hostname (s_ip6), nm_setting_ip_config_get_dhcp_hostname (s_ip6), get_dhcp_hostname_flags (self, AF_INET6), - nm_setting_connection_get_mud_url (s_connection), + nm_setting_connection_get_mud_url (s_con), duid, enforce_duid, iaid, -- cgit v1.2.1 From 4bcaff4cb5f65e9d965d3ed4d1fcacb626d36847 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 24 Apr 2020 08:46:31 +0200 Subject: dhcp: don't make mud-url property of NMDhcpClient readable We have this as a GObject property, so that it can be set at construct time (to be never modified afterwards). We don't need a readable GObject property, because there is a getter function that should be used instead. --- src/dhcp/nm-dhcp-client.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c index 8e50a8f99f..1f6179a8da 100644 --- a/src/dhcp/nm-dhcp-client.c +++ b/src/dhcp/nm-dhcp-client.c @@ -980,9 +980,6 @@ get_property (GObject *object, guint prop_id, case PROP_HOSTNAME: g_value_set_string (value, priv->hostname); break; - case PROP_MUD_URL: - g_value_set_string (value, priv->mud_url); - break; case PROP_ROUTE_METRIC: g_value_set_uint (value, priv->route_metric); break; @@ -1211,7 +1208,7 @@ nm_dhcp_client_class_init (NMDhcpClientClass *client_class) obj_properties[PROP_MUD_URL] = g_param_spec_string (NM_DHCP_CLIENT_MUD_URL, "", "", NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | + G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); obj_properties[PROP_ROUTE_TABLE] = -- cgit v1.2.1 From 3e6b6d34db5de71db503e6c8bcfd9e07efe6e0a5 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 24 Apr 2020 08:50:33 +0200 Subject: dhcp: fix leaking mud_url in NMDhcpClient --- src/dhcp/nm-dhcp-client.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c index 1f6179a8da..f7324baf6e 100644 --- a/src/dhcp/nm-dhcp-client.c +++ b/src/dhcp/nm-dhcp-client.c @@ -1116,6 +1116,7 @@ dispose (GObject *object) nm_clear_g_free (&priv->iface); nm_clear_g_free (&priv->hostname); nm_clear_g_free (&priv->uuid); + nm_clear_g_free (&priv->mud_url); nm_clear_pointer (&priv->client_id, g_bytes_unref); nm_clear_pointer (&priv->hwaddr, g_bytes_unref); nm_clear_pointer (&priv->bcast_hwaddr, g_bytes_unref); -- cgit v1.2.1 From bdb1d71cfa0ef3feb8c6be2d60f84c963fd5d30b Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 24 Apr 2020 08:50:33 +0200 Subject: dhcp: fix leaking mud_url in NMSettingConnection --- libnm-core/nm-setting-connection.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c index db05caf633..2f64e17739 100644 --- a/libnm-core/nm-setting-connection.c +++ b/libnm-core/nm-setting-connection.c @@ -1643,6 +1643,7 @@ finalize (GObject *object) g_free (priv->zone); g_free (priv->master); g_free (priv->slave_type); + g_free (priv->mud_url); g_slist_free_full (priv->permissions, (GDestroyNotify) permission_free); g_slist_free_full (priv->secondaries, g_free); -- cgit v1.2.1 From 3a2858a2fddfa306f9b37ed02055eb75c7f89dea Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 24 Apr 2020 09:05:25 +0200 Subject: ifcfg-rh/trivial: drop comment for nms_ifcfg_well_known_keys The comment isn't right. The fixed array size is in the header file, because other parts of the code need to know how many elements are in the array. The alternative would be a define for the size, but that is only redundant information. Also, even with a define the user who adds an entry needs to adjust the code in the header. Explicitly stating the array size in the header makes it almost impossible to accidentally choosing the wrong size, because the compiler (and unit tests) ensure the consistency. --- src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h index 25a5c0ac73..e6343e1dcd 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h @@ -33,7 +33,6 @@ typedef struct { NMSIfcfgKeyTypeFlags key_flags; } NMSIfcfgKeyTypeInfo; -/* maybe think about getting rid of the fixed number below at some point.*/ extern const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[233]; const NMSIfcfgKeyTypeInfo *nms_ifcfg_well_known_key_find_info (const char *key, gssize *out_idx); -- cgit v1.2.1 From 03b606d1ffc6fd19394490fc310b22026abfca32 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 24 Apr 2020 09:11:12 +0200 Subject: dhcp: set MUD URL in DHCPv6 request for systemd DHCP client --- src/dhcp/nm-dhcp-systemd.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c index 983f4e2a65..72f60ccbf0 100644 --- a/src/dhcp/nm-dhcp-systemd.c +++ b/src/dhcp/nm-dhcp-systemd.c @@ -904,6 +904,7 @@ ip6_start (NMDhcpClient *client, nm_auto (sd_dhcp6_client_unrefp) sd_dhcp6_client *sd_client = NULL; GBytes *hwaddr; const char *hostname; + const char *mud_url; int r, i; const guint8 *duid_arr; gsize duid_len; @@ -986,6 +987,15 @@ ip6_start (NMDhcpClient *client, } } + mud_url = nm_dhcp_client_get_mud_url (client); + if (mud_url) { + r = sd_dhcp6_client_set_request_mud_url (sd_client, mud_url); + if (r < 0) { + nm_utils_error_set_errno (error, r, "failed to set mud-url: %s"); + return FALSE; + } + } + if (needed_prefixes > 0) { if (needed_prefixes > 1) _LOGW ("dhcp-client6: only one prefix request is supported"); -- cgit v1.2.1 From b775dda9288aff27febf375b601cbf8e9da34891 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 24 Apr 2020 09:17:59 +0200 Subject: libnm: fix symbol versioning for nm_setting_connection_get_mud_url() --- libnm/libnm.ver | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libnm/libnm.ver b/libnm/libnm.ver index e572ccb3b2..b4af766a42 100644 --- a/libnm/libnm.ver +++ b/libnm/libnm.ver @@ -473,7 +473,6 @@ global: nm_setting_connection_get_id; nm_setting_connection_get_interface_name; nm_setting_connection_get_master; - nm_setting_connection_get_mud_url; nm_setting_connection_get_num_permissions; nm_setting_connection_get_num_secondaries; nm_setting_connection_get_permission; @@ -1696,3 +1695,8 @@ global: nm_setting_vrf_get_type; nm_setting_vrf_new; } libnm_1_22_8; + +libnm_1_26_0 { +global: + nm_setting_connection_get_mud_url; +} libnm_1_24_0; -- cgit v1.2.1 From de2062c08d71fa603448cd3ef260d7ad62896a73 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 24 Apr 2020 09:20:25 +0200 Subject: libnm: fix API version annotation for nm_setting_connection_get_mud_url() --- libnm-core/nm-setting-connection.c | 5 +++-- libnm-core/nm-setting-connection.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c index 2f64e17739..caacdf36c5 100644 --- a/libnm-core/nm-setting-connection.c +++ b/libnm-core/nm-setting-connection.c @@ -758,8 +758,9 @@ nm_setting_connection_get_secondary (NMSettingConnection *setting, guint32 idx) * * Returns the value contained in the #NMSettingConnection:mud-url * property. + * + * Since: 1.26 **/ - const char * nm_setting_connection_get_mud_url (NMSettingConnection *setting) { @@ -2327,6 +2328,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass) * to manufacturer-recommended network policies for IoT devices. It is transmitted * as a DHCPv4 or DHCPv6 option. * + * Since: 1.26 **/ /* ---ifcfg-rh--- * property: mud-url @@ -2336,7 +2338,6 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass) * example: https://yourdevice.example.com/model.json * ---end--- */ - obj_properties[PROP_MUD_URL] = g_param_spec_string (NM_SETTING_CONNECTION_MUD_URL, "", "", NULL, diff --git a/libnm-core/nm-setting-connection.h b/libnm-core/nm-setting-connection.h index 36df389671..9a6f09a852 100644 --- a/libnm-core/nm-setting-connection.h +++ b/libnm-core/nm-setting-connection.h @@ -205,6 +205,7 @@ NMSettingConnectionLlmnr nm_setting_connection_get_llmnr (NMSettingConnection * NM_AVAILABLE_IN_1_20 gint32 nm_setting_connection_get_wait_device_timeout (NMSettingConnection *setting); +NM_AVAILABLE_IN_1_26 const char *nm_setting_connection_get_mud_url (NMSettingConnection *setting); G_END_DECLS -- cgit v1.2.1 From cedcea5ee812ce99a62d47b400518401e018bf74 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 24 Apr 2020 09:31:30 +0200 Subject: libnm: fix verification of connection:mud-url property For one, the setters sd_dhcp_client_set_mud_url() and sd_dhcp6_client_set_request_mud_url() assert that the value honors these settings. So, we must never pass such values to the function. Also, before calling n_dhcp4_client_probe_config_append_option() the code doesn't check whether the URL is short enough. That would be a bug (unless we ensure that the property is valid from the beginning). In general, it is necessary to strictly validate the parameter. Also, returning NM_SETTING_VERIFY_NORMALIZABLE_ERROR for a property that does not get normalized is a bug. --- libnm-core/nm-setting-connection.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c index caacdf36c5..545dd8168c 100644 --- a/libnm-core/nm-setting-connection.c +++ b/libnm-core/nm-setting-connection.c @@ -16,6 +16,7 @@ #include "nm-setting-bridge.h" #include "nm-setting-team.h" #include "nm-setting-vlan.h" +#include "systemd/nm-sd-utils-shared.h" /** * SECTION:nm-setting-connection @@ -1230,6 +1231,27 @@ after_interface_name: return FALSE; } + if (priv->mud_url) { + if (!priv->mud_url[0]) { + g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("property is empty")); + g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), NM_SETTING_CONNECTION_MUD_URL); + return FALSE; + } + if (strlen (priv->mud_url) > 255) { + g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("DHCP option cannot be longer than 255 characters")); + g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), NM_SETTING_CONNECTION_MUD_URL); + return FALSE; + } + if (!nm_sd_http_url_is_valid (priv->mud_url)) { + g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("MUD URL is not a valid URL")); + g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), NM_SETTING_CONNECTION_MUD_URL); + return FALSE; + } + } + /* *** errors above here should be always fatal, below NORMALIZABLE_ERROR *** */ if (!priv->uuid) { @@ -1241,13 +1263,6 @@ after_interface_name: return NM_SETTING_VERIFY_NORMALIZABLE_ERROR; } - if (priv->mud_url && !*priv->mud_url) { - g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("property is empty")); - g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), NM_SETTING_CONNECTION_MUD_URL); - return NM_SETTING_VERIFY_NORMALIZABLE_ERROR; - } - if (normerr_base_type) { g_set_error (error, NM_CONNECTION_ERROR, @@ -1493,8 +1508,8 @@ get_property (GObject *object, guint prop_id, case PROP_WAIT_DEVICE_TIMEOUT: g_value_set_int (value, priv->wait_device_timeout); break; - case PROP_MUD_URL: - g_value_set_string (value, nm_setting_connection_get_mud_url(setting)); + case PROP_MUD_URL: + g_value_set_string (value, priv->mud_url); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -- cgit v1.2.1 From fff8119317a93ee2ded6ea8862424bfa68aa5117 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 24 Apr 2020 10:15:47 +0200 Subject: NEWS: update --- NEWS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS b/NEWS index d83eeb74c4..2b87553835 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,8 @@ The API is subject to change and not guaranteed to be compatible with the later release. USE AT YOUR OWN RISK. NOT RECOMMENDED FOR PRODUCTION USE! +* Add MUD URL property for connection profiles (RFC 8520) and set it + for DHCP and DHCPv6 requests. * IPv6 SLAAC: improved the reaction of IPv6 SLAAC to renumbering events: - honor PIO Valid Lifetimes < 2 hours. - cap the Preferred Lifetime of PIOs to the "Router Lifetime" value -- cgit v1.2.1