From 53d9050b3690f2076f38f423381552c844498731 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Wed, 5 Sep 2018 09:24:33 +0200 Subject: [PATCH 1/8] core: add nm_config_data_get_connection_default_int64() --- src/devices/nm-device-ethernet.c | 33 +++--- src/devices/nm-device.c | 191 +++++++++++++----------------- src/devices/wifi/nm-device-wifi.c | 90 +++++++------- src/nm-config-data.c | 14 +++ src/nm-config-data.h | 7 ++ src/nm-manager.c | 21 ++-- src/vpn/nm-vpn-connection.c | 11 +- 7 files changed, 173 insertions(+), 194 deletions(-) diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index 4d4624b7f8..0fb8fea42c 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -1198,7 +1198,6 @@ wake_on_lan_enable (NMDevice *device) NMSettingWiredWakeOnLan wol; NMSettingWired *s_wired; const char *password = NULL; - gs_free char *value = NULL; s_wired = (NMSettingWired *) nm_device_get_applied_setting (device, NM_TYPE_SETTING_WIRED); if (s_wired) { @@ -1208,27 +1207,25 @@ wake_on_lan_enable (NMDevice *device) goto found; } - value = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA, - "ethernet.wake-on-lan", - device); + wol = nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA, + "ethernet.wake-on-lan", + device, + NM_SETTING_WIRED_WAKE_ON_LAN_NONE, + G_MAXINT32, + NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT); - if (value) { - wol = _nm_utils_ascii_str_to_int64 (value, 10, - NM_SETTING_WIRED_WAKE_ON_LAN_NONE, - G_MAXINT32, - NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT); - - if ( NM_FLAGS_ANY (wol, NM_SETTING_WIRED_WAKE_ON_LAN_EXCLUSIVE_FLAGS) - && !nm_utils_is_power_of_two (wol)) { - nm_log_dbg (LOGD_ETHER, "invalid default value %u for wake-on-lan", (guint) wol); - wol = NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT; - } - if (wol != NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT) - goto found; + if ( NM_FLAGS_ANY (wol, NM_SETTING_WIRED_WAKE_ON_LAN_EXCLUSIVE_FLAGS) + && !nm_utils_is_power_of_two (wol)) { + nm_log_dbg (LOGD_ETHER, "invalid default value %u for wake-on-lan", (guint) wol); + wol = NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT; } + if (wol != NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT) + goto found; wol = NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE; found: - return nm_platform_ethtool_set_wake_on_lan (nm_device_get_platform (device), nm_device_get_ifindex (device), wol, password); + return nm_platform_ethtool_set_wake_on_lan (nm_device_get_platform (device), + nm_device_get_ifindex (device), + wol, password); } /*****************************************************************************/ diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index c09a80da54..54dce5a844 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -1101,15 +1101,19 @@ nm_device_assume_state_reset (NMDevice *self) static void init_ip_config_dns_priority (NMDevice *self, NMIPConfig *config) { - gs_free char *value = NULL; + const char *property; int priority; - value = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA, - (nm_ip_config_get_addr_family (config) == AF_INET) - ? "ipv4.dns-priority" - : "ipv6.dns-priority", - self); - priority = _nm_utils_ascii_str_to_int64 (value, 10, G_MININT, G_MAXINT, 0); + property = (nm_ip_config_get_addr_family (config) == AF_INET) + ? "ipv4.dns-priority" + : "ipv6.dns-priority"; + + priority = nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA, + property, + self, + G_MININT, + G_MAXINT, + 0); nm_ip_config_set_dns_priority (config, priority ?: NM_DNS_PRIORITY_DEFAULT_NORMAL); } @@ -2108,10 +2112,10 @@ guint32 nm_device_get_route_metric (NMDevice *self, int addr_family) { - char *value; gint64 route_metric; NMSettingIPConfig *s_ip; NMConnection *connection; + const char *property; g_return_val_if_fail (NM_IS_DEVICE (self), G_MAXUINT32); g_return_val_if_fail (NM_IN_SET (addr_family, AF_INET, AF_INET6), G_MAXUINT32); @@ -2136,15 +2140,13 @@ nm_device_get_route_metric (NMDevice *self, /* use the current NMConfigData, which makes this configuration reloadable. * Note that that means that the route-metric might change between SIGHUP. * You must cache the returned value if that is a problem. */ - value = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA, - addr_family == AF_INET ? "ipv4.route-metric" : "ipv6.route-metric", self); - if (value) { - route_metric = _nm_utils_ascii_str_to_int64 (value, 10, 0, G_MAXUINT32, -1); - g_free (value); - - if (route_metric >= 0) - goto out; - } + property = addr_family == AF_INET ? "ipv4.route-metric" : "ipv6.route-metric"; + route_metric = nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA, + property, + self, + 0, G_MAXUINT32, -1); + if (route_metric >= 0) + goto out; route_metric = nm_manager_device_route_metric_reserve (nm_manager_get (), nm_device_get_ip_ifindex (self), @@ -2164,21 +2166,15 @@ _get_mdns (NMDevice *self) connection = nm_device_get_applied_connection (self); if (connection) mdns = nm_setting_connection_get_mdns (nm_connection_get_setting_connection (connection)); + if (mdns != NM_SETTING_CONNECTION_MDNS_DEFAULT) + return mdns; - if (mdns == NM_SETTING_CONNECTION_MDNS_DEFAULT) { - gs_free char *value = NULL; - - value = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA, - "connection.mdns", - self); - mdns = _nm_utils_ascii_str_to_int64 (value, - 10, - NM_SETTING_CONNECTION_MDNS_NO, - NM_SETTING_CONNECTION_MDNS_YES, - NM_SETTING_CONNECTION_MDNS_DEFAULT); - } - - return mdns; + return nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA, + "connection.mdns", + self, + NM_SETTING_CONNECTION_MDNS_NO, + NM_SETTING_CONNECTION_MDNS_YES, + NM_SETTING_CONNECTION_MDNS_DEFAULT); } guint32 @@ -2221,14 +2217,13 @@ nm_device_get_route_table (NMDevice *self, * connection. Otherwise, the connection is not active, and the * connection default doesn't matter. */ if (route_table == 0) { - gs_free char *value = NULL; + const char *property; - value = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA, - addr_family == AF_INET - ? "ipv4.route-table" - : "ipv6.route-table", - self); - route_table = _nm_utils_ascii_str_to_int64 (value, 10, 0, G_MAXUINT32, 0); + property = addr_family == AF_INET ? "ipv4.route-table" : "ipv6.route-table"; + route_table = nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA, + property, + self, + 0, G_MAXUINT32, 0); } } @@ -6028,15 +6023,12 @@ lldp_rx_enabled (NMDevice *self) lldp = nm_setting_connection_get_lldp (s_con); if (lldp == NM_SETTING_CONNECTION_LLDP_DEFAULT) { - gs_free char *value = NULL; - - value = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA, - "connection.lldp", - self); - lldp = _nm_utils_ascii_str_to_int64 (value, 10, - NM_SETTING_CONNECTION_LLDP_DEFAULT, - NM_SETTING_CONNECTION_LLDP_ENABLE_RX, - NM_SETTING_CONNECTION_LLDP_DEFAULT); + lldp = nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA, + "connection.lldp", + self, + NM_SETTING_CONNECTION_LLDP_DEFAULT, + NM_SETTING_CONNECTION_LLDP_ENABLE_RX, + NM_SETTING_CONNECTION_LLDP_DEFAULT); if (lldp == NM_SETTING_CONNECTION_LLDP_DEFAULT) lldp = NM_SETTING_CONNECTION_LLDP_DISABLE; } @@ -6130,18 +6122,17 @@ act_stage1_prepare (NMDevice *self, NMDeviceStateReason *out_failure_reason) && (s_sriov = (NMSettingSriov *) nm_device_get_applied_setting (self, NM_TYPE_SETTING_SRIOV))) { nm_auto_freev NMPlatformVF **plat_vfs = NULL; gs_free_error GError *error = NULL; - gs_free const char *str = NULL; NMSriovVF *vf; int autoprobe; autoprobe = nm_setting_sriov_get_autoprobe_drivers (s_sriov); if (autoprobe == NM_TERNARY_DEFAULT) { - str = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA, - "sriov.autoprobe-drivers", self); - autoprobe = _nm_utils_ascii_str_to_int64 (str, 10, - NM_TERNARY_FALSE, - NM_TERNARY_TRUE, - NM_TERNARY_TRUE); + autoprobe = nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA, + "sriov.autoprobe-drivers", + self, + NM_TERNARY_FALSE, + NM_TERNARY_TRUE, + NM_TERNARY_TRUE); } num = nm_setting_sriov_get_num_vfs (s_sriov); @@ -6496,27 +6487,22 @@ get_ipv4_dad_timeout (NMDevice *self) { NMConnection *connection; NMSettingIPConfig *s_ip4 = NULL; - gs_free char *value = NULL; - int ret = 0; + int timeout = -1; connection = nm_device_get_applied_connection (self); if (connection) s_ip4 = nm_connection_get_setting_ip4_config (connection); + if (s_ip4) + timeout = nm_setting_ip_config_get_dad_timeout (s_ip4); + if (timeout >= 0) + return timeout; - if (s_ip4) { - ret = nm_setting_ip_config_get_dad_timeout (s_ip4); - - if (ret < 0) { - value = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA, - "ipv4.dad-timeout", self); - ret = _nm_utils_ascii_str_to_int64 (value, 10, -1, - NM_SETTING_IP_CONFIG_DAD_TIMEOUT_MAX, - -1); - ret = ret < 0 ? 0 : ret; - } - } - - return ret; + return nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA, + "ipv4.dad-timeout", + self, + 0, + NM_SETTING_IP_CONFIG_DAD_TIMEOUT_MAX, + 0); } static void @@ -7363,19 +7349,14 @@ get_dhcp_timeout (NMDevice *self, int addr_family) if (timeout) return timeout; - { - gs_free char *value = NULL; - - value = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA, - addr_family == AF_INET - ? "ipv4.dhcp-timeout" - : "ipv6.dhcp-timeout", - self); - timeout = _nm_utils_ascii_str_to_int64 (value, 10, - 0, G_MAXINT32, 0); - if (timeout) - return timeout; - } + timeout = nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA, + addr_family == AF_INET + ? "ipv4.dhcp-timeout" + : "ipv6.dhcp-timeout", + self, + 0, G_MAXINT32, 0); + if (timeout) + return timeout; klass = NM_DEVICE_GET_CLASS (self); if (klass->get_dhcp_timeout) @@ -8747,10 +8728,10 @@ gint64 nm_device_get_configured_mtu_from_connection_default (NMDevice *self, const char *property_name) { - gs_free char *str = NULL; - - str = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA, property_name, self); - return _nm_utils_ascii_str_to_int64 (str, 10, 0, G_MAXUINT32, -1); + return nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA, + property_name, + self, + 0, G_MAXUINT32, -1); } guint32 @@ -9447,7 +9428,6 @@ static NMSettingIP6ConfigPrivacy _ip6_privacy_get (NMDevice *self) { NMSettingIP6ConfigPrivacy ip6_privacy; - gs_free char *value = NULL; NMConnection *connection; g_return_val_if_fail (self, NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN); @@ -9466,14 +9446,13 @@ _ip6_privacy_get (NMDevice *self) } } - value = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA, - "ipv6.ip6-privacy", self); - /* 2.) use the default value from the configuration. */ - ip6_privacy = _nm_utils_ascii_str_to_int64 (value, 10, - NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN, - NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR, - NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN); + ip6_privacy = nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA, + "ipv6.ip6-privacy", + self, + NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN, + NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR, + NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN); if (ip6_privacy != NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN) return ip6_privacy; @@ -15647,7 +15626,6 @@ nm_device_get_supplicant_timeout (NMDevice *self) { NMConnection *connection; NMSetting8021x *s_8021x; - gs_free char *value = NULL; int timeout; #define SUPPLICANT_DEFAULT_TIMEOUT 25 @@ -15662,11 +15640,12 @@ nm_device_get_supplicant_timeout (NMDevice *self) return timeout; } - value = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA, - "802-1x.auth-timeout", - self); - return _nm_utils_ascii_str_to_int64 (value, 10, 1, G_MAXINT32, - SUPPLICANT_DEFAULT_TIMEOUT); + return nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA, + "802-1x.auth-timeout", + self, + 1, + G_MAXINT32, + SUPPLICANT_DEFAULT_TIMEOUT); } gboolean @@ -15689,12 +15668,10 @@ nm_device_auth_retries_try_next (NMDevice *self) auth_retries = nm_setting_connection_get_auth_retries (s_con); if (auth_retries == -1) { - gs_free char *value = NULL; - - value = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA, - "connection.auth-retries", - self); - auth_retries = _nm_utils_ascii_str_to_int64 (value, 10, -1, G_MAXINT32, -1); + auth_retries = nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA, + "connection.auth-retries", + self, + -1, G_MAXINT32, -1); } if (auth_retries == 0) diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c index e4b105eb32..64ab82cb0c 100644 --- a/src/devices/wifi/nm-device-wifi.c +++ b/src/devices/wifi/nm-device-wifi.c @@ -2364,7 +2364,6 @@ build_supplicant_config (NMDeviceWifi *self, NMSettingWirelessSecurity *s_wireless_sec; NMSettingWirelessSecurityPmf pmf; NMSettingWirelessSecurityFils fils; - gs_free char *value = NULL; g_return_val_if_fail (priv->sup_iface, NULL); @@ -2406,25 +2405,23 @@ build_supplicant_config (NMDeviceWifi *self, /* Configure PMF (802.11w) */ pmf = nm_setting_wireless_security_get_pmf (s_wireless_sec); if (pmf == NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT) { - value = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA, - "wifi-sec.pmf", - NM_DEVICE (self)); - pmf = _nm_utils_ascii_str_to_int64 (value, 10, - NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE, - NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED, - NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL); + pmf = nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA, + "wifi-sec.pmf", + NM_DEVICE (self), + NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE, + NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED, + NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL); } /* Configure FILS (802.11ai) */ fils = nm_setting_wireless_security_get_fils (s_wireless_sec); if (fils == NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT) { - value = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA, - "wifi-sec.fils", - NM_DEVICE (self)); - fils = _nm_utils_ascii_str_to_int64 (value, 10, - NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE, - NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED, - NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL); + fils = nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA, + "wifi-sec.fils", + NM_DEVICE (self), + NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE, + NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED, + NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL); } s_8021x = nm_connection_get_setting_802_1x (connection); @@ -2461,7 +2458,6 @@ wake_on_wlan_enable (NMDeviceWifi *self) NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self); NMSettingWirelessWakeOnWLan wowl; NMSettingWireless *s_wireless; - gs_free char *value = NULL; s_wireless = (NMSettingWireless *) nm_device_get_applied_setting (NM_DEVICE (self), NM_TYPE_SETTING_WIRELESS); if (s_wireless) { @@ -2470,31 +2466,27 @@ wake_on_wlan_enable (NMDeviceWifi *self) goto found; } - value = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA, - "wifi.wake-on-wlan", - NM_DEVICE (self)); + wowl = nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA, + "wifi.wake-on-wlan", + NM_DEVICE (self), + NM_SETTING_WIRELESS_WAKE_ON_WLAN_NONE, + G_MAXINT32, + NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT); - if (value) { - wowl = _nm_utils_ascii_str_to_int64 (value, 10, - NM_SETTING_WIRELESS_WAKE_ON_WLAN_NONE, - G_MAXINT32, - NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT); - - if (NM_FLAGS_ANY (wowl, NM_SETTING_WIRELESS_WAKE_ON_WLAN_EXCLUSIVE_FLAGS)) { - if (!nm_utils_is_power_of_two (wowl)) { - _LOGD (LOGD_WIFI, "invalid default value %u for wake-on-wlan: " - "'default' and 'ignore' are exclusive flags", (guint) wowl); - wowl = NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT; - } - } else if (NM_FLAGS_ANY (wowl, ~NM_SETTING_WIRELESS_WAKE_ON_WLAN_ALL)) { - _LOGD (LOGD_WIFI, "invalid default value %u for wake-on-wlan", (guint) wowl); + if (NM_FLAGS_ANY (wowl, NM_SETTING_WIRELESS_WAKE_ON_WLAN_EXCLUSIVE_FLAGS)) { + if (!nm_utils_is_power_of_two (wowl)) { + _LOGD (LOGD_WIFI, "invalid default value %u for wake-on-wlan: " + "'default' and 'ignore' are exclusive flags", (guint) wowl); wowl = NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT; } - if (wowl != NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT) - goto found; + } else if (NM_FLAGS_ANY (wowl, ~NM_SETTING_WIRELESS_WAKE_ON_WLAN_ALL)) { + _LOGD (LOGD_WIFI, "invalid default value %u for wake-on-wlan", (guint) wowl); + wowl = NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT; } - wowl = NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE; + if (wowl != NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT) + goto found; + wowl = NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE; found: if (wowl == NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE) { priv->wowlan_restore = wowl; @@ -2641,31 +2633,29 @@ set_powersave (NMDevice *device) { NMDeviceWifi *self = NM_DEVICE_WIFI (device); NMSettingWireless *s_wireless; - NMSettingWirelessPowersave powersave; - gs_free char *value = NULL; + NMSettingWirelessPowersave val; s_wireless = (NMSettingWireless *) nm_device_get_applied_setting (device, NM_TYPE_SETTING_WIRELESS); g_return_if_fail (s_wireless); - powersave = nm_setting_wireless_get_powersave (s_wireless); - if (powersave == NM_SETTING_WIRELESS_POWERSAVE_DEFAULT) { - value = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA, - "wifi.powersave", - device); - powersave = _nm_utils_ascii_str_to_int64 (value, 10, - NM_SETTING_WIRELESS_POWERSAVE_IGNORE, - NM_SETTING_WIRELESS_POWERSAVE_ENABLE, - NM_SETTING_WIRELESS_POWERSAVE_IGNORE); + val = nm_setting_wireless_get_powersave (s_wireless); + if (val == NM_SETTING_WIRELESS_POWERSAVE_DEFAULT) { + val = nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA, + "wifi.powersave", + device, + NM_SETTING_WIRELESS_POWERSAVE_IGNORE, + NM_SETTING_WIRELESS_POWERSAVE_ENABLE, + NM_SETTING_WIRELESS_POWERSAVE_IGNORE); } - _LOGT (LOGD_WIFI, "powersave is set to %u", (unsigned) powersave); + _LOGT (LOGD_WIFI, "powersave is set to %u", (unsigned) val); - if (powersave == NM_SETTING_WIRELESS_POWERSAVE_IGNORE) + if (val == NM_SETTING_WIRELESS_POWERSAVE_IGNORE) return; nm_platform_wifi_set_powersave (nm_device_get_platform (device), nm_device_get_ifindex (device), - powersave == NM_SETTING_WIRELESS_POWERSAVE_ENABLE); + val == NM_SETTING_WIRELESS_POWERSAVE_ENABLE); } static NMActStageReturn diff --git a/src/nm-config-data.c b/src/nm-config-data.c index d8ad07c054..8d84e74abc 100644 --- a/src/nm-config-data.c +++ b/src/nm-config-data.c @@ -1371,6 +1371,20 @@ nm_config_data_get_connection_default (const NMConfigData *self, return value; } +gint64 +nm_config_data_get_connection_default_int64 (const NMConfigData *self, + const char *property, + NMDevice *device, + gint64 min, + gint64 max, + gint64 fallback) +{ + gs_free char *value = NULL; + + value = nm_config_data_get_connection_default (self, property, device); + return _nm_utils_ascii_str_to_int64 (value, 10, min, max, fallback); +} + static void _get_connection_info_init (MatchSectionInfo *connection_info, GKeyFile *keyfile, char *group) { diff --git a/src/nm-config-data.h b/src/nm-config-data.h index 43da96fdc8..b52ddcc4f8 100644 --- a/src/nm-config-data.h +++ b/src/nm-config-data.h @@ -181,6 +181,13 @@ char *nm_config_data_get_connection_default (const NMConfigData *self, const char *property, NMDevice *device); +gint64 nm_config_data_get_connection_default_int64 (const NMConfigData *self, + const char *property, + NMDevice *device, + gint64 min, + gint64 max, + gint64 fallback); + char *nm_config_data_get_device_config (const NMConfigData *self, const char *property, NMDevice *device, diff --git a/src/nm-manager.c b/src/nm-manager.c index 44be55164a..f8be6d3792 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -3959,27 +3959,24 @@ static gboolean should_connect_slaves (NMConnection *connection, NMDevice *device) { NMSettingConnection *s_con; - NMSettingConnectionAutoconnectSlaves autoconnect_slaves; - gs_free char *value = NULL; + NMSettingConnectionAutoconnectSlaves val; s_con = nm_connection_get_setting_connection (connection); g_assert (s_con); - /* Check autoconnect-slaves property */ - autoconnect_slaves = nm_setting_connection_get_autoconnect_slaves (s_con); - if (autoconnect_slaves != NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT) + val = nm_setting_connection_get_autoconnect_slaves (s_con); + if (val != NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT) goto out; - /* Check configuration default for autoconnect-slaves property */ - value = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA, - "connection.autoconnect-slaves", device); - if (value) - autoconnect_slaves = _nm_utils_ascii_str_to_int64 (value, 10, 0, 1, -1); + val = nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA, + "connection.autoconnect-slaves", + device, + 0, 1, -1); out: - if (autoconnect_slaves == NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO) + if (val == NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO) return FALSE; - if (autoconnect_slaves == NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_YES) + if (val == NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_YES) return TRUE; return FALSE; } diff --git a/src/vpn/nm-vpn-connection.c b/src/vpn/nm-vpn-connection.c index f06d94a3a8..bbf6b9e99a 100644 --- a/src/vpn/nm-vpn-connection.c +++ b/src/vpn/nm-vpn-connection.c @@ -1876,13 +1876,10 @@ connect_success (NMVpnConnection *self) * It is a configured value or 60 seconds */ timeout = nm_setting_vpn_get_timeout (s_vpn); if (timeout == 0) { - char *value; - - value = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA, - "vpn.timeout", NULL); - timeout = _nm_utils_ascii_str_to_int64 (value, 10, 0, G_MAXUINT32, 60); - timeout = timeout == 0 ? 60 : timeout; - g_free (value); + timeout = nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA, + "vpn.timeout", + NULL, + 1, G_MAXUINT32, 60); } priv->connect_timeout = g_timeout_add_seconds (timeout, connect_timeout_cb, self); From 8e6ad2853cf3166be810381771800ffd3e36f8b2 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Fri, 31 Aug 2018 15:18:48 +0200 Subject: [PATCH 2/8] libnm-core: fix documentation for connection.mdns After an update of the connection.mdns property, a reactivation is needed to apply the new value. Also, the ifcfg-rh variable name was wrong. Fixes: 2e2ff6f27aa1bfa7a27d49980b319873240ec84b --- clients/common/settings-docs.h.in | 2 +- libnm-core/nm-setting-connection.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in index d430e686d7..80c38a97b3 100644 --- a/clients/common/settings-docs.h.in +++ b/clients/common/settings-docs.h.in @@ -136,7 +136,7 @@ #define DESCRIBE_DOC_NM_SETTING_CONNECTION_INTERFACE_NAME N_("The name of the network interface this connection is bound to. If not set, then the connection can be attached to any interface of the appropriate type (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_LLDP N_("Whether LLDP is enabled for the connection.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_MASTER N_("Interface name of the master device or UUID of the master connection.") -#define DESCRIBE_DOC_NM_SETTING_CONNECTION_MDNS N_("Whether mDNS is enabled for the connection. The permitted values are: yes: register hostname and resolving for the connection, no: disable mDNS for the interface, resolve: do not register hostname but allow resolving of mDNS host names. When updating this property on a currently activated connection, the change takes effect immediately. This feature requires a plugin which supports mDNS. One such plugin is dns-systemd-resolved.") +#define DESCRIBE_DOC_NM_SETTING_CONNECTION_MDNS N_("Whether mDNS is enabled for the connection. The permitted values are: yes: register hostname and resolving for the connection, no: disable mDNS for the interface, resolve: do not register hostname but allow resolving of mDNS host names. This feature requires a plugin which supports mDNS. One such plugin is dns-systemd-resolved.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_METERED N_("Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_MULTI_CONNECT N_("Specifies whether the profile can be active multiple times at a particular moment. The value is of type NMConnectionMultiConnect.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_PERMISSIONS N_("An array of strings defining what access a given user has to this connection. If this is NULL or empty, all users are allowed to access this connection; otherwise users are allowed if and only if they are in this list. When this is not empty, the connection can be active only when one of the specified users is logged into an active session. Each entry is of the form \"[type]:[id]:[reserved]\"; for example, \"user:dcbw:blah\". At this time only the \"user\" [type] is allowed. Any other values are ignored and reserved for future use. [id] is the username that this permission refers to, which may not contain the \":\" character. Any [reserved] information present must be ignored and is reserved for future use. All of [type], [id], and [reserved] must be valid UTF-8.") diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c index a7d1777f01..ba9f52b16e 100644 --- a/libnm-core/nm-setting-connection.c +++ b/libnm-core/nm-setting-connection.c @@ -2104,8 +2104,6 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass) * The permitted values are: yes: register hostname and resolving * for the connection, no: disable mDNS for the interface, resolve: * do not register hostname but allow resolving of mDNS host names. - * When updating this property on a currently activated connection, - * the change takes effect immediately. * * This feature requires a plugin which supports mDNS. One such * plugin is dns-systemd-resolved. @@ -2114,11 +2112,11 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass) **/ /* ---ifcfg-rh--- * property: mdns - * variable: CONNECTION_MDNS(+) + * variable: MDNS(+) * values: yes,no,resolve * default: missing variable means global default * description: Whether or not mDNS is enabled for the connection - * example: CONNECTION_MDNS=yes + * example: MDNS=yes * ---end--- */ g_object_class_install_property From e83c31bbe0afff018dad0fa09184d0d63c2ee1a0 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Fri, 31 Aug 2018 10:48:18 +0200 Subject: [PATCH 3/8] libnm-core: add connection.llmnr property --- clients/common/settings-docs.h.in | 1 + libnm-core/nm-setting-connection.c | 68 ++++++++++++++++++++++++++++-- libnm-core/nm-setting-connection.h | 22 ++++++++++ libnm-core/tests/test-general.c | 1 + libnm/libnm.ver | 2 + 5 files changed, 91 insertions(+), 3 deletions(-) diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in index 80c38a97b3..1e3cf3be4a 100644 --- a/clients/common/settings-docs.h.in +++ b/clients/common/settings-docs.h.in @@ -135,6 +135,7 @@ #define DESCRIBE_DOC_NM_SETTING_CONNECTION_ID N_("A human readable unique identifier for the connection, like \"Work Wi-Fi\" or \"T-Mobile 3G\".") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_INTERFACE_NAME N_("The name of the network interface this connection is bound to. If not set, then the connection can be attached to any interface of the appropriate type (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_LLDP N_("Whether LLDP is enabled for the connection.") +#define DESCRIBE_DOC_NM_SETTING_CONNECTION_LLMNR N_("Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: yes: register hostname and resolving for the connection, no: disable LLMNR for the interface, resolve: do not register hostname but allow resolving of LLMNR host names. This feature requires a plugin which supports LLMNR. One such plugin is dns-systemd-resolved.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_MASTER N_("Interface name of the master device or UUID of the master connection.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_MDNS N_("Whether mDNS is enabled for the connection. The permitted values are: yes: register hostname and resolving for the connection, no: disable mDNS for the interface, resolve: do not register hostname but allow resolving of mDNS host names. This feature requires a plugin which supports mDNS. One such plugin is dns-systemd-resolved.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_METERED N_("Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately.") diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c index ba9f52b16e..33fa921428 100644 --- a/libnm-core/nm-setting-connection.c +++ b/libnm-core/nm-setting-connection.c @@ -81,6 +81,7 @@ typedef struct { NMSettingConnectionLldp lldp; int auth_retries; int mdns; + int llmnr; } NMSettingConnectionPrivate; enum { @@ -105,6 +106,7 @@ enum { PROP_METERED, PROP_LLDP, PROP_MDNS, + PROP_LLMNR, PROP_STABLE_ID, PROP_AUTH_RETRIES, @@ -896,6 +898,23 @@ nm_setting_connection_get_mdns (NMSettingConnection *setting) return NM_SETTING_CONNECTION_GET_PRIVATE (setting)->mdns; } +/** + * nm_setting_connection_get_llmnr: + * @setting: the #NMSettingConnection + * + * Returns: the #NMSettingConnection:llmnr property of the setting. + * + * Since: 1.14 + **/ +NMSettingConnectionLlmnr +nm_setting_connection_get_llmnr (NMSettingConnection *setting) +{ + g_return_val_if_fail (NM_IS_SETTING_CONNECTION (setting), + NM_SETTING_CONNECTION_LLMNR_DEFAULT); + + return NM_SETTING_CONNECTION_GET_PRIVATE (setting)->llmnr; +} + static void _set_error_missing_base_setting (GError **error, const char *type) { @@ -1093,17 +1112,28 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) return FALSE; } - if ( priv->mdns < NM_SETTING_CONNECTION_MDNS_DEFAULT - || priv->mdns > NM_SETTING_CONNECTION_MDNS_YES) { + if ( priv->mdns < (int) NM_SETTING_CONNECTION_MDNS_DEFAULT + || priv->mdns > (int) NM_SETTING_CONNECTION_MDNS_YES) { g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("mdns value %d is not valid"), priv->mdns); + _("value %d is not valid"), priv->mdns); g_prefix_error (error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_MDNS); return FALSE; } + if ( priv->llmnr < (int) NM_SETTING_CONNECTION_LLMNR_DEFAULT + || priv->llmnr > (int) NM_SETTING_CONNECTION_LLMNR_YES) { + g_set_error (error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("value %d is not valid"), priv->llmnr); + g_prefix_error (error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_LLMNR); + return FALSE; + } + if (!NM_IN_SET (priv->multi_connect, (int) NM_CONNECTION_MULTI_CONNECT_DEFAULT, (int) NM_CONNECTION_MULTI_CONNECT_SINGLE, (int) NM_CONNECTION_MULTI_CONNECT_MANUAL_MULTIPLE, @@ -1276,6 +1306,7 @@ nm_setting_connection_init (NMSettingConnection *setting) NMSettingConnectionPrivate *priv = NM_SETTING_CONNECTION_GET_PRIVATE (setting); priv->mdns = NM_SETTING_CONNECTION_MDNS_DEFAULT; + priv->llmnr = NM_SETTING_CONNECTION_LLMNR_DEFAULT; } static void @@ -1400,6 +1431,9 @@ set_property (GObject *object, guint prop_id, case PROP_MDNS: priv->mdns = g_value_get_int (value); break; + case PROP_LLMNR: + priv->llmnr = g_value_get_int (value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -1494,6 +1528,9 @@ get_property (GObject *object, guint prop_id, case PROP_MDNS: g_value_set_int (value, priv->mdns); break; + case PROP_LLMNR: + g_value_set_int (value, priv->llmnr); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -2127,6 +2164,31 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + /** + * NMSettingConnection:llmnr: + * + * Whether Link-Local Multicast Name Resolution (LLMNR) is enabled + * for the connection. LLMNR is a protocol based on the Domain Name + * System (DNS) packet format that allows both IPv4 and IPv6 hosts + * to perform name resolution for hosts on the same local link. + * + * The permitted values are: yes: register hostname and resolving + * for the connection, no: disable LLMNR for the interface, resolve: + * do not register hostname but allow resolving of LLMNR host names. + * + * This feature requires a plugin which supports LLMNR. One such + * plugin is dns-systemd-resolved. + * + * Since: 1.14 + **/ + g_object_class_install_property + (object_class, PROP_LLMNR, + g_param_spec_int (NM_SETTING_CONNECTION_LLMNR, "", "", + G_MININT32, G_MAXINT32, + NM_SETTING_CONNECTION_LLMNR_DEFAULT, + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS)); + _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_CONNECTION, NULL, properties_override); } diff --git a/libnm-core/nm-setting-connection.h b/libnm-core/nm-setting-connection.h index ab20cefd96..b65fb67ba7 100644 --- a/libnm-core/nm-setting-connection.h +++ b/libnm-core/nm-setting-connection.h @@ -66,6 +66,7 @@ G_BEGIN_DECLS #define NM_SETTING_CONNECTION_LLDP "lldp" #define NM_SETTING_CONNECTION_AUTH_RETRIES "auth-retries" #define NM_SETTING_CONNECTION_MDNS "mdns" +#define NM_SETTING_CONNECTION_LLMNR "llmnr" /* Types for property values */ /** @@ -117,6 +118,24 @@ typedef enum { NM_SETTING_CONNECTION_MDNS_YES = 2, } NMSettingConnectionMdns; +/** + * NMSettingConnectionLlmnr: + * @NM_SETTING_CONNECTION_LLMNR_DEFAULT: default value + * @NM_SETTING_CONNECTION_LLMNR_NO: disable LLMNR + * @NM_SETTING_CONNECTION_LLMNR_RESOLVE: support only resolving, do not register hostname + * @NM_SETTING_CONNECTION_LLMNR_YES: enable LLMNR + * + * #NMSettingConnectionLlmnr values indicate whether LLMNR should be enabled. + * + * Since: 1.14 + */ +typedef enum { + NM_SETTING_CONNECTION_LLMNR_DEFAULT = -1, + NM_SETTING_CONNECTION_LLMNR_NO = 0, + NM_SETTING_CONNECTION_LLMNR_RESOLVE = 1, + NM_SETTING_CONNECTION_LLMNR_YES = 2, +} NMSettingConnectionLlmnr; + /** * NMSettingConnection: * @@ -194,6 +213,9 @@ int nm_setting_connection_get_auth_retries (NMSettingConnection *set NM_AVAILABLE_IN_1_12 NMSettingConnectionMdns nm_setting_connection_get_mdns (NMSettingConnection *setting); +NM_AVAILABLE_IN_1_14 +NMSettingConnectionLlmnr nm_setting_connection_get_llmnr (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 324c9d110f..38531248ca 100644 --- a/libnm-core/tests/test-general.c +++ b/libnm-core/tests/test-general.c @@ -2618,6 +2618,7 @@ test_connection_diff_a_only (void) { NM_SETTING_CONNECTION_LLDP, NM_SETTING_DIFF_RESULT_IN_A }, { 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 }, { NULL, NM_SETTING_DIFF_RESULT_UNKNOWN } } }, { NM_SETTING_WIRED_SETTING_NAME, { diff --git a/libnm/libnm.ver b/libnm/libnm.ver index 77ac0eed50..00dd06e4f5 100644 --- a/libnm/libnm.ver +++ b/libnm/libnm.ver @@ -1393,7 +1393,9 @@ global: nm_device_wireguard_get_type; nm_device_wpan_get_type; nm_setting_6lowpan_get_type; + nm_setting_connection_get_llmnr; nm_setting_connection_get_multi_connect; + nm_setting_connection_llmnr_get_type; nm_setting_ethtool_clear_features; nm_setting_ethtool_get_feature; nm_setting_ethtool_get_type; From bc7efc750ab4ba0d67d61d17ad2d45e087cb80bb Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Fri, 31 Aug 2018 15:14:39 +0200 Subject: [PATCH 4/8] core: add support for connection.llmnr --- man/NetworkManager.conf.xml | 3 +++ src/devices/nm-device.c | 26 ++++++++++++++++++++++++++ src/dns/nm-dns-systemd-resolved.c | 28 ++++++++++++++++++++++++---- src/nm-ip4-config.c | 27 +++++++++++++++++++++++++++ src/nm-ip4-config.h | 4 ++++ src/vpn/nm-vpn-connection.c | 1 + 6 files changed, 85 insertions(+), 4 deletions(-) diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 34ab6999d3..87cf001621 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -653,6 +653,9 @@ ipv6.ip6-privacy=0 connection.lldp + + connection.llmnr + connection.mdns diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 54dce5a844..872f6c8f07 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -2177,6 +2177,28 @@ _get_mdns (NMDevice *self) NM_SETTING_CONNECTION_MDNS_DEFAULT); } +static NMSettingConnectionLlmnr +_get_llmnr (NMDevice *self) +{ + NMConnection *connection; + NMSettingConnectionLlmnr llmnr = NM_SETTING_CONNECTION_LLMNR_DEFAULT; + + g_return_val_if_fail (NM_IS_DEVICE (self), NM_SETTING_CONNECTION_LLMNR_DEFAULT); + + connection = nm_device_get_applied_connection (self); + if (connection) + llmnr = nm_setting_connection_get_llmnr (nm_connection_get_setting_connection (connection)); + if (llmnr != NM_SETTING_CONNECTION_LLMNR_DEFAULT) + return llmnr; + + return nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA, + "connection.llmnr", + self, + NM_SETTING_CONNECTION_LLMNR_NO, + NM_SETTING_CONNECTION_LLMNR_YES, + NM_SETTING_CONNECTION_LLMNR_DEFAULT); +} + guint32 nm_device_get_route_table (NMDevice *self, int addr_family, @@ -6883,6 +6905,7 @@ ensure_con_ip_config (NMDevice *self, int addr_family) nm_ip4_config_merge_setting (NM_IP4_CONFIG (con_ip_config), nm_connection_get_setting_ip4_config (connection), _get_mdns (self), + _get_llmnr (self), nm_device_get_route_table (self, addr_family, TRUE), nm_device_get_route_metric (self, addr_family)); } else { @@ -7295,6 +7318,7 @@ dhcp4_state_changed (NMDhcpClient *client, nm_ip4_config_merge_setting (manual, nm_connection_get_setting_ip4_config (connection), NM_SETTING_CONNECTION_MDNS_DEFAULT, + NM_SETTING_CONNECTION_LLMNR_DEFAULT, nm_device_get_route_table (self, AF_INET, TRUE), nm_device_get_route_metric (self, AF_INET)); @@ -7817,6 +7841,7 @@ act_stage3_ip4_config_start (NMDevice *self, nm_ip4_config_merge_setting (config, nm_connection_get_setting_ip4_config (connection), NM_SETTING_CONNECTION_MDNS_DEFAULT, + NM_SETTING_CONNECTION_LLMNR_DEFAULT, nm_device_get_route_table (self, AF_INET, TRUE), nm_device_get_route_metric (self, AF_INET)); configs = g_new0 (NMIP4Config *, 2); @@ -10682,6 +10707,7 @@ nm_device_reactivate_ip4_config (NMDevice *self, nm_ip4_config_merge_setting (priv->con_ip_config_4, s_ip4_new, _get_mdns (self), + _get_llmnr (self), nm_device_get_route_table (self, AF_INET, TRUE), nm_device_get_route_metric (self, AF_INET)); diff --git a/src/dns/nm-dns-systemd-resolved.c b/src/dns/nm-dns-systemd-resolved.c index 1a73aae127..544f19c107 100644 --- a/src/dns/nm-dns-systemd-resolved.c +++ b/src/dns/nm-dns-systemd-resolved.c @@ -65,7 +65,6 @@ typedef struct { GDBusProxy *resolve; GCancellable *init_cancellable; GCancellable *update_cancellable; - GCancellable *mdns_cancellable; CList request_queue_lst_head; } NMDnsSystemdResolvedPrivate; @@ -192,7 +191,8 @@ prepare_one_interface (NMDnsSystemdResolved *self, InterfaceConfig *ic) GVariantBuilder dns, domains; NMCListElem *elem; NMSettingConnectionMdns mdns = NM_SETTING_CONNECTION_MDNS_DEFAULT; - const char *mdns_arg = NULL; + NMSettingConnectionLlmnr llmnr = NM_SETTING_CONNECTION_LLMNR_DEFAULT; + const char *mdns_arg = NULL, *llmnr_arg = NULL; g_variant_builder_init (&dns, G_VARIANT_TYPE ("(ia(iay))")); g_variant_builder_add (&dns, "i", ic->ifindex); @@ -208,8 +208,10 @@ prepare_one_interface (NMDnsSystemdResolved *self, InterfaceConfig *ic) update_add_ip_config (self, &dns, &domains, data); - if (NM_IS_IP4_CONFIG (ip_config)) + if (NM_IS_IP4_CONFIG (ip_config)) { mdns = NM_MAX (mdns, nm_ip4_config_mdns_get (NM_IP4_CONFIG (ip_config))); + llmnr = NM_MAX (llmnr, nm_ip4_config_llmnr_get (NM_IP4_CONFIG (ip_config))); + } } g_variant_builder_close (&dns); @@ -231,6 +233,22 @@ prepare_one_interface (NMDnsSystemdResolved *self, InterfaceConfig *ic) } nm_assert (mdns_arg); + switch (llmnr) { + case NM_SETTING_CONNECTION_LLMNR_NO: + llmnr_arg = "no"; + break; + case NM_SETTING_CONNECTION_LLMNR_RESOLVE: + llmnr_arg = "resolve"; + break; + case NM_SETTING_CONNECTION_LLMNR_YES: + llmnr_arg = "yes"; + break; + case NM_SETTING_CONNECTION_LLMNR_DEFAULT: + llmnr_arg = ""; + break; + } + nm_assert (llmnr_arg); + _request_item_append (&priv->request_queue_lst_head, "SetLinkDNS", g_variant_builder_end (&dns)); @@ -240,6 +258,9 @@ prepare_one_interface (NMDnsSystemdResolved *self, InterfaceConfig *ic) _request_item_append (&priv->request_queue_lst_head, "SetLinkMulticastDNS", g_variant_new ("(is)", ic->ifindex, mdns_arg ?: "")); + _request_item_append (&priv->request_queue_lst_head, + "SetLinkLLMNR", + g_variant_new ("(is)", ic->ifindex, llmnr_arg ?: "")); } static void @@ -410,7 +431,6 @@ dispose (GObject *object) g_clear_object (&priv->resolve); nm_clear_g_cancellable (&priv->init_cancellable); nm_clear_g_cancellable (&priv->update_cancellable); - nm_clear_g_cancellable (&priv->mdns_cancellable); G_OBJECT_CLASS (nm_dns_systemd_resolved_parent_class)->dispose (object); } diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index 1edd3257af..5f1004130c 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -295,6 +295,7 @@ typedef struct { NMIPConfigSource mtu_source; int dns_priority; NMSettingConnectionMdns mdns; + NMSettingConnectionLlmnr llmnr; GArray *nameservers; GPtrArray *domains; GPtrArray *searches; @@ -916,6 +917,7 @@ void nm_ip4_config_merge_setting (NMIP4Config *self, NMSettingIPConfig *setting, NMSettingConnectionMdns mdns, + NMSettingConnectionLlmnr llmnr, guint32 route_table, guint32 route_metric) { @@ -1033,6 +1035,7 @@ nm_ip4_config_merge_setting (NMIP4Config *self, nm_ip4_config_set_dns_priority (self, priority); nm_ip4_config_mdns_set (self, mdns); + nm_ip4_config_llmnr_set (self, llmnr); g_object_thaw_notify (G_OBJECT (self)); } @@ -1253,6 +1256,10 @@ nm_ip4_config_merge (NMIP4Config *dst, nm_ip4_config_mdns_set (dst, NM_MAX (nm_ip4_config_mdns_get (src), nm_ip4_config_mdns_get (dst))); + /* LLMNR */ + nm_ip4_config_llmnr_set (dst, + NM_MAX (nm_ip4_config_llmnr_get (src), + nm_ip4_config_llmnr_get (dst))); g_object_thaw_notify (G_OBJECT (dst)); } @@ -1494,6 +1501,10 @@ nm_ip4_config_subtract (NMIP4Config *dst, if (nm_ip4_config_mdns_get (src) == nm_ip4_config_mdns_get (dst)) nm_ip4_config_mdns_set (dst, NM_SETTING_CONNECTION_MDNS_DEFAULT); + /* LLMNR */ + if (nm_ip4_config_llmnr_get (src) == nm_ip4_config_llmnr_get (dst)) + nm_ip4_config_llmnr_set (dst, NM_SETTING_CONNECTION_LLMNR_DEFAULT); + g_object_thaw_notify (G_OBJECT (dst)); } @@ -1595,6 +1606,7 @@ _nm_ip4_config_intersect_helper (NMIP4Config *dst, /* ignore NIS */ /* ignore WINS */ /* ignore mdns */ + /* ignore LLMNR */ if (update_dst) g_object_thaw_notify (G_OBJECT (dst)); @@ -1874,6 +1886,7 @@ nm_ip4_config_replace (NMIP4Config *dst, const NMIP4Config *src, gboolean *relev } dst_priv->mdns = src_priv->mdns; + dst_priv->llmnr = src_priv->llmnr; /* DNS priority */ if (src_priv->dns_priority != dst_priv->dns_priority) { @@ -2562,6 +2575,19 @@ nm_ip4_config_mdns_set (NMIP4Config *self, NM_IP4_CONFIG_GET_PRIVATE (self)->mdns = mdns; } +NMSettingConnectionLlmnr +nm_ip4_config_llmnr_get (const NMIP4Config *self) +{ + return NM_IP4_CONFIG_GET_PRIVATE (self)->llmnr; +} + +void +nm_ip4_config_llmnr_set (NMIP4Config *self, + NMSettingConnectionLlmnr llmnr) +{ + NM_IP4_CONFIG_GET_PRIVATE (self)->llmnr = llmnr; +} + /*****************************************************************************/ void @@ -3212,6 +3238,7 @@ nm_ip4_config_init (NMIP4Config *self) NMP_OBJECT_TYPE_IP4_ROUTE); priv->mdns = NM_SETTING_CONNECTION_MDNS_DEFAULT; + priv->llmnr = NM_SETTING_CONNECTION_LLMNR_DEFAULT; priv->nameservers = g_array_new (FALSE, FALSE, sizeof (guint32)); priv->domains = g_ptr_array_new_with_free_func (g_free); priv->searches = g_ptr_array_new_with_free_func (g_free); diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h index 1992fc2e95..d9ac969cb2 100644 --- a/src/nm-ip4-config.h +++ b/src/nm-ip4-config.h @@ -175,6 +175,7 @@ gboolean nm_ip4_config_commit (const NMIP4Config *self, void nm_ip4_config_merge_setting (NMIP4Config *self, NMSettingIPConfig *setting, NMSettingConnectionMdns mdns, + NMSettingConnectionLlmnr llmnr, guint32 route_table, guint32 route_metric); NMSetting *nm_ip4_config_create_setting (const NMIP4Config *self); @@ -203,6 +204,9 @@ in_addr_t nmtst_ip4_config_get_gateway (NMIP4Config *config); NMSettingConnectionMdns nm_ip4_config_mdns_get (const NMIP4Config *self); void nm_ip4_config_mdns_set (NMIP4Config *self, NMSettingConnectionMdns mdns); +NMSettingConnectionLlmnr nm_ip4_config_llmnr_get (const NMIP4Config *self); +void nm_ip4_config_llmnr_set (NMIP4Config *self, + NMSettingConnectionLlmnr llmnr); const NMDedupMultiHeadEntry *nm_ip4_config_lookup_addresses (const NMIP4Config *self); void nm_ip4_config_reset_addresses (NMIP4Config *self); diff --git a/src/vpn/nm-vpn-connection.c b/src/vpn/nm-vpn-connection.c index bbf6b9e99a..d1aaa7c991 100644 --- a/src/vpn/nm-vpn-connection.c +++ b/src/vpn/nm-vpn-connection.c @@ -1619,6 +1619,7 @@ nm_vpn_connection_ip4_config_get (NMVpnConnection *self, GVariant *dict) nm_ip4_config_merge_setting (config, s_ip, nm_setting_connection_get_mdns (s_con), + nm_setting_connection_get_llmnr (s_con), route_table, route_metric); From 481fce62bff1c51e9378071fd55ca0e1c6ddad13 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Fri, 31 Aug 2018 17:41:16 +0200 Subject: [PATCH 5/8] cli: add support for connection.llmnr --- clients/common/nm-meta-setting-desc.c | 8 + .../test_002.expected | 10 +- .../test_003.expected | 472 ++++++------ .../test_004.expected | 678 ++++++++++-------- 4 files changed, 656 insertions(+), 512 deletions(-) diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index 09f30641fa..8c27779e26 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -5829,6 +5829,14 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = { ), ), ), + PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_LLMNR, + .property_type = &_pt_gobject_enum, + .property_typ_data = DEFINE_PROPERTY_TYP_DATA ( + PROPERTY_TYP_DATA_SUBTYPE (gobject_enum, + .get_gtype = nm_setting_connection_llmnr_get_type, + ), + ), + ), NULL }; 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 1ea6dc96c8..3802657b25 100644 --- a/clients/tests/test-client.check-on-disk/test_002.expected +++ b/clients/tests/test-client.check-on-disk/test_002.expected @@ -484,12 +484,12 @@ NAME UUID TYPE DEVICE con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- <<< -size: 1171 +size: 1224 location: clients/tests/test-client.py:859:test_002()/23 cmd: $NMCLI c s con-1 lang: C returncode: 0 -stdout: 1042 bytes +stdout: 1095 bytes >>> connection.id: con-1 connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d @@ -513,14 +513,15 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) <<< -size: 1183 +size: 1236 location: clients/tests/test-client.py:859:test_002()/24 cmd: $NMCLI c s con-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1044 bytes +stdout: 1097 bytes >>> connection.id: con-1 connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d @@ -544,5 +545,6 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) <<< 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 80c7f12d7d..65f5778535 100644 --- a/clients/tests/test-client.check-on-disk/test_003.expected +++ b/clients/tests/test-client.check-on-disk/test_003.expected @@ -262,12 +262,12 @@ UUID NAME UUID-ethernet-REPLACED-REPLACED-REPL ethernet <<< -size: 3752 +size: 3805 location: clients/tests/test-client.py:919:test_003()/22 cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 -stdout: 3611 bytes +stdout: 3664 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -291,6 +291,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 802-3-ethernet.duplex: -- @@ -351,12 +352,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 3780 +size: 3833 location: clients/tests/test-client.py:919:test_003()/23 cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 3629 bytes +stdout: 3682 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -380,6 +381,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 802-3-ethernet.duplex: -- @@ -460,12 +462,12 @@ stdout: 51 bytes GENERAL.STATE: aktywowano <<< -size: 4409 +size: 4462 location: clients/tests/test-client.py:925:test_003()/26 cmd: $NMCLI con s ethernet lang: C returncode: 0 -stdout: 4275 bytes +stdout: 4328 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -489,6 +491,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 802-3-ethernet.duplex: -- @@ -561,12 +564,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 4441 +size: 4494 location: clients/tests/test-client.py:925:test_003()/27 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 4297 bytes +stdout: 4350 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -590,6 +593,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 802-3-ethernet.duplex: -- @@ -1094,12 +1098,12 @@ UUID NAME UUID-ethernet-REPLACED-REPLACED-REPL ethernet <<< -size: 3752 +size: 3805 location: clients/tests/test-client.py:919:test_003()/45 cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 -stdout: 3611 bytes +stdout: 3664 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -1123,6 +1127,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 802-3-ethernet.duplex: -- @@ -1183,12 +1188,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 3780 +size: 3833 location: clients/tests/test-client.py:919:test_003()/46 cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 3629 bytes +stdout: 3682 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -1212,6 +1217,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 802-3-ethernet.duplex: -- @@ -1296,12 +1302,12 @@ GENERAL.STATE: aktywowano GENERAL.STATE: aktywowano <<< -size: 5074 +size: 5127 location: clients/tests/test-client.py:925:test_003()/49 cmd: $NMCLI con s ethernet lang: C returncode: 0 -stdout: 4940 bytes +stdout: 4993 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -1325,6 +1331,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 802-3-ethernet.duplex: -- @@ -1410,12 +1417,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 5110 +size: 5163 location: clients/tests/test-client.py:925:test_003()/50 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 4966 bytes +stdout: 5019 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -1439,6 +1446,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 802-3-ethernet.duplex: -- @@ -1874,12 +1882,12 @@ UUID-ethernet-REPLACED-REPLACED-REPL ethernet UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -size: 5077 +size: 5130 location: clients/tests/test-client.py:955:test_003()/61 cmd: $NMCLI con s ethernet lang: C returncode: 0 -stdout: 4943 bytes +stdout: 4996 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -1903,6 +1911,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 802-3-ethernet.duplex: -- @@ -1988,12 +1997,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 5114 +size: 5167 location: clients/tests/test-client.py:955:test_003()/62 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 4970 bytes +stdout: 5023 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -2017,6 +2026,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 802-3-ethernet.duplex: -- @@ -2102,12 +2112,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 4452 +size: 4505 location: clients/tests/test-client.py:958:test_003()/63 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 4278 bytes +stdout: 4331 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -2131,6 +2141,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 802-3-ethernet.duplex: -- @@ -2203,12 +2214,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 4485 +size: 4538 location: clients/tests/test-client.py:958:test_003()/64 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4301 bytes +stdout: 4354 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -2232,6 +2243,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 802-3-ethernet.duplex: -- @@ -2486,12 +2498,12 @@ UUID TYPE UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -size: 5089 +size: 5142 location: clients/tests/test-client.py:955:test_003()/71 cmd: $NMCLI --color yes con s ethernet lang: C returncode: 0 -stdout: 4943 bytes +stdout: 4996 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -2515,6 +2527,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 802-3-ethernet.duplex: -- @@ -2600,12 +2613,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 5126 +size: 5179 location: clients/tests/test-client.py:955:test_003()/72 cmd: $NMCLI --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 4970 bytes +stdout: 5023 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -2629,6 +2642,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 802-3-ethernet.duplex: -- @@ -2714,12 +2728,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 4464 +size: 4517 location: clients/tests/test-client.py:958:test_003()/73 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 4278 bytes +stdout: 4331 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -2743,6 +2757,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 802-3-ethernet.duplex: -- @@ -2815,12 +2830,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 4497 +size: 4550 location: clients/tests/test-client.py:958:test_003()/74 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4301 bytes +stdout: 4354 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -2844,6 +2859,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 802-3-ethernet.duplex: -- @@ -3114,12 +3130,12 @@ UUID-ethernet-REPLACED-REPLACED-REPL ethernet UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -size: 6331 +size: 6384 location: clients/tests/test-client.py:955:test_003()/81 cmd: $NMCLI --pretty con s ethernet lang: C returncode: 0 -stdout: 6188 bytes +stdout: 6241 bytes >>> =============================================================================== Connection profile details (ethernet) @@ -3146,6 +3162,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -3244,12 +3261,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 6387 +size: 6440 location: clients/tests/test-client.py:955:test_003()/82 cmd: $NMCLI --pretty con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 6234 bytes +stdout: 6287 bytes >>> =============================================================================== Szczegóły profilu połączenia (ethernet) @@ -3276,6 +3293,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -3374,12 +3392,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 5393 +size: 5446 location: clients/tests/test-client.py:958:test_003()/83 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 5210 bytes +stdout: 5263 bytes >>> =============================================================================== Connection profile details (ethernet) @@ -3406,6 +3424,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -3487,12 +3506,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 5438 +size: 5491 location: clients/tests/test-client.py:958:test_003()/84 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5245 bytes +stdout: 5298 bytes >>> =============================================================================== Szczegóły profilu połączenia (ethernet) @@ -3519,6 +3538,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -3820,12 +3840,12 @@ UUID TYPE UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -size: 6343 +size: 6396 location: clients/tests/test-client.py:955:test_003()/91 cmd: $NMCLI --pretty --color yes con s ethernet lang: C returncode: 0 -stdout: 6188 bytes +stdout: 6241 bytes >>> =============================================================================== Connection profile details (ethernet) @@ -3852,6 +3872,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -3950,12 +3971,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 6399 +size: 6452 location: clients/tests/test-client.py:955:test_003()/92 cmd: $NMCLI --pretty --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 6234 bytes +stdout: 6287 bytes >>> =============================================================================== Szczegóły profilu połączenia (ethernet) @@ -3982,6 +4003,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -4080,12 +4102,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 5405 +size: 5458 location: clients/tests/test-client.py:958:test_003()/93 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 5210 bytes +stdout: 5263 bytes >>> =============================================================================== Connection profile details (ethernet) @@ -4112,6 +4134,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -4193,12 +4216,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 5450 +size: 5503 location: clients/tests/test-client.py:958:test_003()/94 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5245 bytes +stdout: 5298 bytes >>> =============================================================================== Szczegóły profilu połączenia (ethernet) @@ -4225,6 +4248,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -4506,12 +4530,12 @@ UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet <<< -size: 2749 +size: 2769 location: clients/tests/test-client.py:955:test_003()/101 cmd: $NMCLI --terse con s ethernet lang: C returncode: 0 -stdout: 2606 bytes +stdout: 2626 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -4535,6 +4559,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 802-3-ethernet.duplex: @@ -4620,12 +4645,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2759 +size: 2779 location: clients/tests/test-client.py:955:test_003()/102 cmd: $NMCLI --terse con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 2606 bytes +stdout: 2626 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -4649,6 +4674,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 802-3-ethernet.duplex: @@ -4734,12 +4760,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2421 +size: 2441 location: clients/tests/test-client.py:958:test_003()/103 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 2238 bytes +stdout: 2258 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -4763,6 +4789,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 802-3-ethernet.duplex: @@ -4835,12 +4862,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2431 +size: 2451 location: clients/tests/test-client.py:958:test_003()/104 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2238 bytes +stdout: 2258 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -4864,6 +4891,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 802-3-ethernet.duplex: @@ -5114,12 +5142,12 @@ stdout: 174 bytes UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet <<< -size: 2761 +size: 2781 location: clients/tests/test-client.py:955:test_003()/111 cmd: $NMCLI --terse --color yes con s ethernet lang: C returncode: 0 -stdout: 2606 bytes +stdout: 2626 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -5143,6 +5171,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 802-3-ethernet.duplex: @@ -5228,12 +5257,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2771 +size: 2791 location: clients/tests/test-client.py:955:test_003()/112 cmd: $NMCLI --terse --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 2606 bytes +stdout: 2626 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -5257,6 +5286,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 802-3-ethernet.duplex: @@ -5342,12 +5372,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2433 +size: 2453 location: clients/tests/test-client.py:958:test_003()/113 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 2238 bytes +stdout: 2258 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -5371,6 +5401,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 802-3-ethernet.duplex: @@ -5443,12 +5474,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2443 +size: 2463 location: clients/tests/test-client.py:958:test_003()/114 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2238 bytes +stdout: 2258 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -5472,6 +5503,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 802-3-ethernet.duplex: @@ -5726,15 +5758,15 @@ UUID-ethernet-REPLACED-REPLACED-REPL ethernet UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -size: 3388 +size: 3416 location: clients/tests/test-client.py:955:test_003()/121 cmd: $NMCLI --mode tabular con s ethernet lang: C returncode: 0 -stdout: 3238 bytes +stdout: 3266 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 -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) +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 +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) 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 -- @@ -5757,15 +5789,15 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating <<< -size: 3422 +size: 3450 location: clients/tests/test-client.py:955:test_003()/122 cmd: $NMCLI --mode tabular con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 3262 bytes +stdout: 3290 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 -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) +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 +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) 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 -- @@ -5788,15 +5820,15 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie <<< -size: 2946 +size: 2974 location: clients/tests/test-client.py:958:test_003()/123 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 2756 bytes +stdout: 2784 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 -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) +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 +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) 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 -- @@ -5815,15 +5847,15 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating <<< -size: 2978 +size: 3006 location: clients/tests/test-client.py:958:test_003()/124 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2778 bytes +stdout: 2806 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 -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) +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 +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) 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 -- @@ -5960,15 +5992,15 @@ UUID TYPE UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -size: 3400 +size: 3428 location: clients/tests/test-client.py:955:test_003()/131 cmd: $NMCLI --mode tabular --color yes con s ethernet lang: C returncode: 0 -stdout: 3238 bytes +stdout: 3266 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 -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) +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 +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) 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 -- @@ -5991,15 +6023,15 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating <<< -size: 3434 +size: 3462 location: clients/tests/test-client.py:955:test_003()/132 cmd: $NMCLI --mode tabular --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 3262 bytes +stdout: 3290 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 -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) +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 +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) 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 -- @@ -6022,15 +6054,15 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie <<< -size: 2958 +size: 2986 location: clients/tests/test-client.py:958:test_003()/133 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 2756 bytes +stdout: 2784 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 -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) +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 +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) 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 -- @@ -6049,15 +6081,15 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating <<< -size: 2990 +size: 3018 location: clients/tests/test-client.py:958:test_003()/134 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2778 bytes +stdout: 2806 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 -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) +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 +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) 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 -- @@ -6210,19 +6242,19 @@ UUID-ethernet-REPLACED-REPLACED-REPL ethernet UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -size: 5565 +size: 5607 location: clients/tests/test-client.py:955:test_003()/141 cmd: $NMCLI --mode tabular --pretty con s ethernet lang: C returncode: 0 -stdout: 5406 bytes +stdout: 5448 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 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -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) +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 +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +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) 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 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -6257,19 +6289,19 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating <<< -size: 5659 +size: 5701 location: clients/tests/test-client.py:955:test_003()/142 cmd: $NMCLI --mode tabular --pretty con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 5490 bytes +stdout: 5532 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 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -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) +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 +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +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) 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 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -6304,19 +6336,19 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie <<< -size: 4671 +size: 4713 location: clients/tests/test-client.py:958:test_003()/143 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 4472 bytes +stdout: 4514 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 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -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) +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 +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +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) 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 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -6343,19 +6375,19 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating <<< -size: 4743 +size: 4785 location: clients/tests/test-client.py:958:test_003()/144 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4534 bytes +stdout: 4576 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 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -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) +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 +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +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) 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 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -6538,19 +6570,19 @@ UUID TYPE UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -size: 5577 +size: 5619 location: clients/tests/test-client.py:955:test_003()/151 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet lang: C returncode: 0 -stdout: 5406 bytes +stdout: 5448 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 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -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) +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 +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +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) 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 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -6585,19 +6617,19 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating <<< -size: 5671 +size: 5713 location: clients/tests/test-client.py:955:test_003()/152 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 5490 bytes +stdout: 5532 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 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -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) +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 +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +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) 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 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -6632,19 +6664,19 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie <<< -size: 4683 +size: 4725 location: clients/tests/test-client.py:958:test_003()/153 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 4472 bytes +stdout: 4514 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 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -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) +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 +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +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) 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 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -6671,19 +6703,19 @@ GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating <<< -size: 4755 +size: 4797 location: clients/tests/test-client.py:958:test_003()/154 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4534 bytes +stdout: 4576 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 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -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) +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 +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +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) 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 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -6846,14 +6878,14 @@ UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet <<< -size: 825 +size: 828 location: clients/tests/test-client.py:955:test_003()/161 cmd: $NMCLI --mode tabular --terse con s ethernet lang: C returncode: 0 -stdout: 668 bytes +stdout: 671 bytes >>> -connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1 +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1 802-3-ethernet::0::no:::::auto::::default: ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: @@ -6863,14 +6895,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/3:: <<< -size: 835 +size: 838 location: clients/tests/test-client.py:955:test_003()/162 cmd: $NMCLI --mode tabular --terse con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 668 bytes +stdout: 671 bytes >>> -connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1 +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1 802-3-ethernet::0::no:::::auto::::default: ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: @@ -6880,14 +6912,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/3:: <<< -size: 678 +size: 681 location: clients/tests/test-client.py:958:test_003()/163 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 481 bytes +stdout: 484 bytes >>> -connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1 +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1 802-3-ethernet::0::no:::::auto::::default: ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: @@ -6895,14 +6927,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/3:: <<< -size: 688 +size: 691 location: clients/tests/test-client.py:958:test_003()/164 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 481 bytes +stdout: 484 bytes >>> -connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1 +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1 802-3-ethernet::0::no:::::auto::::default: ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: @@ -6994,14 +7026,14 @@ stdout: 174 bytes UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet <<< -size: 837 +size: 840 location: clients/tests/test-client.py:955:test_003()/171 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet lang: C returncode: 0 -stdout: 668 bytes +stdout: 671 bytes >>> -connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1 +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1 802-3-ethernet::0::no:::::auto::::default: ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: @@ -7011,14 +7043,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/3:: <<< -size: 847 +size: 850 location: clients/tests/test-client.py:955:test_003()/172 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 668 bytes +stdout: 671 bytes >>> -connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1 +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1 802-3-ethernet::0::no:::::auto::::default: ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: @@ -7028,14 +7060,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/3:: <<< -size: 690 +size: 693 location: clients/tests/test-client.py:958:test_003()/173 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 481 bytes +stdout: 484 bytes >>> -connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1 +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1 802-3-ethernet::0::no:::::auto::::default: ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: @@ -7043,14 +7075,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/3:: <<< -size: 700 +size: 703 location: clients/tests/test-client.py:958:test_003()/174 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 481 bytes +stdout: 484 bytes >>> -connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1 +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1 802-3-ethernet::0::no:::::auto::::default: ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: @@ -7260,12 +7292,12 @@ UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA TYPE: ethernet <<< -size: 5095 +size: 5148 location: clients/tests/test-client.py:955:test_003()/181 cmd: $NMCLI --mode multiline con s ethernet lang: C returncode: 0 -stdout: 4943 bytes +stdout: 4996 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -7289,6 +7321,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 802-3-ethernet.duplex: -- @@ -7374,12 +7407,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 5132 +size: 5185 location: clients/tests/test-client.py:955:test_003()/182 cmd: $NMCLI --mode multiline con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 4970 bytes +stdout: 5023 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -7403,6 +7436,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 802-3-ethernet.duplex: -- @@ -7488,12 +7522,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 4470 +size: 4523 location: clients/tests/test-client.py:958:test_003()/183 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 4278 bytes +stdout: 4331 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -7517,6 +7551,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 802-3-ethernet.duplex: -- @@ -7589,12 +7624,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 4503 +size: 4556 location: clients/tests/test-client.py:958:test_003()/184 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4301 bytes +stdout: 4354 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -7618,6 +7653,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 802-3-ethernet.duplex: -- @@ -7986,12 +8022,12 @@ UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA TYPE: ethernet <<< -size: 5107 +size: 5160 location: clients/tests/test-client.py:955:test_003()/191 cmd: $NMCLI --mode multiline --color yes con s ethernet lang: C returncode: 0 -stdout: 4943 bytes +stdout: 4996 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -8015,6 +8051,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 802-3-ethernet.duplex: -- @@ -8100,12 +8137,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 5144 +size: 5197 location: clients/tests/test-client.py:955:test_003()/192 cmd: $NMCLI --mode multiline --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 4970 bytes +stdout: 5023 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -8129,6 +8166,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 802-3-ethernet.duplex: -- @@ -8214,12 +8252,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 4482 +size: 4535 location: clients/tests/test-client.py:958:test_003()/193 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 4278 bytes +stdout: 4331 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -8243,6 +8281,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 802-3-ethernet.duplex: -- @@ -8315,12 +8354,12 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -size: 4515 +size: 4568 location: clients/tests/test-client.py:958:test_003()/194 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4301 bytes +stdout: 4354 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -8344,6 +8383,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 802-3-ethernet.duplex: -- @@ -8738,12 +8778,12 @@ TYPE: ethernet ------------------------------------------------------------------------------- <<< -size: 6349 +size: 6402 location: clients/tests/test-client.py:955:test_003()/201 cmd: $NMCLI --mode multiline --pretty con s ethernet lang: C returncode: 0 -stdout: 6188 bytes +stdout: 6241 bytes >>> =============================================================================== Connection profile details (ethernet) @@ -8770,6 +8810,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -8868,12 +8909,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 6405 +size: 6458 location: clients/tests/test-client.py:955:test_003()/202 cmd: $NMCLI --mode multiline --pretty con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 6234 bytes +stdout: 6287 bytes >>> =============================================================================== Szczegóły profilu połączenia (ethernet) @@ -8900,6 +8941,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -8998,12 +9040,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 5411 +size: 5464 location: clients/tests/test-client.py:958:test_003()/203 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 5210 bytes +stdout: 5263 bytes >>> =============================================================================== Connection profile details (ethernet) @@ -9030,6 +9072,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -9111,12 +9154,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 5456 +size: 5509 location: clients/tests/test-client.py:958:test_003()/204 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5245 bytes +stdout: 5298 bytes >>> =============================================================================== Szczegóły profilu połączenia (ethernet) @@ -9143,6 +9186,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -9568,12 +9612,12 @@ TYPE: ethernet ------------------------------------------------------------------------------- <<< -size: 6361 +size: 6414 location: clients/tests/test-client.py:955:test_003()/211 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet lang: C returncode: 0 -stdout: 6188 bytes +stdout: 6241 bytes >>> =============================================================================== Connection profile details (ethernet) @@ -9600,6 +9644,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -9698,12 +9743,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 6417 +size: 6470 location: clients/tests/test-client.py:955:test_003()/212 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 6234 bytes +stdout: 6287 bytes >>> =============================================================================== Szczegóły profilu połączenia (ethernet) @@ -9730,6 +9775,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -9828,12 +9874,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 5423 +size: 5476 location: clients/tests/test-client.py:958:test_003()/213 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 5210 bytes +stdout: 5263 bytes >>> =============================================================================== Connection profile details (ethernet) @@ -9860,6 +9906,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -9941,12 +9988,12 @@ GENERAL.MASTER-PATH: -- ------------------------------------------------------------------------------- <<< -size: 5468 +size: 5521 location: clients/tests/test-client.py:958:test_003()/214 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5245 bytes +stdout: 5298 bytes >>> =============================================================================== Szczegóły profilu połączenia (ethernet) @@ -9973,6 +10020,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- 802-3-ethernet.port: -- 802-3-ethernet.speed: 0 @@ -10372,12 +10420,12 @@ UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA TYPE:802-3-ethernet <<< -size: 2766 +size: 2786 location: clients/tests/test-client.py:955:test_003()/221 cmd: $NMCLI --mode multiline --terse con s ethernet lang: C returncode: 0 -stdout: 2606 bytes +stdout: 2626 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -10401,6 +10449,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 802-3-ethernet.duplex: @@ -10486,12 +10535,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2776 +size: 2796 location: clients/tests/test-client.py:955:test_003()/222 cmd: $NMCLI --mode multiline --terse con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 2606 bytes +stdout: 2626 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -10515,6 +10564,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 802-3-ethernet.duplex: @@ -10600,12 +10650,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2438 +size: 2458 location: clients/tests/test-client.py:958:test_003()/223 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 2238 bytes +stdout: 2258 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -10629,6 +10679,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 802-3-ethernet.duplex: @@ -10701,12 +10752,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2448 +size: 2468 location: clients/tests/test-client.py:958:test_003()/224 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2238 bytes +stdout: 2258 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -10730,6 +10781,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 802-3-ethernet.duplex: @@ -11098,12 +11150,12 @@ UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA TYPE:802-3-ethernet <<< -size: 2778 +size: 2798 location: clients/tests/test-client.py:955:test_003()/231 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet lang: C returncode: 0 -stdout: 2606 bytes +stdout: 2626 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -11127,6 +11179,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 802-3-ethernet.duplex: @@ -11212,12 +11265,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2788 +size: 2808 location: clients/tests/test-client.py:955:test_003()/232 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 2606 bytes +stdout: 2626 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -11241,6 +11294,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 802-3-ethernet.duplex: @@ -11326,12 +11380,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2450 +size: 2470 location: clients/tests/test-client.py:958:test_003()/233 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 2238 bytes +stdout: 2258 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -11355,6 +11409,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 802-3-ethernet.duplex: @@ -11427,12 +11482,12 @@ GENERAL.ZONE: GENERAL.MASTER-PATH: <<< -size: 2460 +size: 2480 location: clients/tests/test-client.py:958:test_003()/234 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2238 bytes +stdout: 2258 bytes >>> connection.id:ethernet connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL @@ -11456,6 +11511,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 802-3-ethernet.port: 802-3-ethernet.speed:0 802-3-ethernet.duplex: 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 e0999eeb86..bef96a6c3b 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:979: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: 3994 +size: 4047 location: clients/tests/test-client.py:981:test_004()/8 cmd: $NMCLI con s con-xx1 lang: C returncode: 0 -stdout: 3862 bytes +stdout: 3915 bytes >>> connection.id: con-xx1 connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA @@ -87,6 +87,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-11-wireless.ssid: foobar 802-11-wireless.mode: infrastructure 802-11-wireless.band: a @@ -150,12 +151,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 4022 +size: 4075 location: clients/tests/test-client.py:981:test_004()/9 cmd: $NMCLI con s con-xx1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3880 bytes +stdout: 3933 bytes >>> connection.id: con-xx1 connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA @@ -179,6 +180,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) 802-11-wireless.ssid: foobar 802-11-wireless.mode: infrastructure 802-11-wireless.band: a @@ -278,12 +280,12 @@ con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP vpn -- con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA wifi -- <<< -size: 3461 +size: 3514 location: clients/tests/test-client.py:993:test_004()/13 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 -stdout: 3326 bytes +stdout: 3379 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -307,6 +309,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -359,12 +362,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 3481 +size: 3534 location: clients/tests/test-client.py:993:test_004()/14 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3336 bytes +stdout: 3389 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -388,6 +391,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -512,12 +516,12 @@ con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA wifi wlan0 con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- <<< -size: 4544 +size: 4597 location: clients/tests/test-client.py:1003:test_004()/21 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 -stdout: 4408 bytes +stdout: 4461 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -541,6 +545,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -613,12 +618,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 4568 +size: 4621 location: clients/tests/test-client.py:1003:test_004()/22 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4422 bytes +stdout: 4475 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -642,6 +647,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -714,12 +720,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 4550 +size: 4603 location: clients/tests/test-client.py:1014:test_004()/23 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 -stdout: 4414 bytes +stdout: 4467 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -743,6 +749,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -815,12 +822,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 4578 +size: 4631 location: clients/tests/test-client.py:1014:test_004()/24 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4432 bytes +stdout: 4485 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -844,6 +851,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -916,12 +924,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 4550 +size: 4603 location: clients/tests/test-client.py:1016:test_004()/25 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 -stdout: 4414 bytes +stdout: 4467 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -945,6 +953,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -1017,12 +1026,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 4578 +size: 4631 location: clients/tests/test-client.py:1016:test_004()/26 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4432 bytes +stdout: 4485 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -1046,6 +1055,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -1118,12 +1128,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 3469 +size: 3522 location: clients/tests/test-client.py:1019:test_004()/27 cmd: $NMCLI -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 3326 bytes +stdout: 3379 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -1147,6 +1157,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -1199,12 +1210,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 3489 +size: 3542 location: clients/tests/test-client.py:1019:test_004()/28 cmd: $NMCLI -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3336 bytes +stdout: 3389 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -1228,6 +1239,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -3558,12 +3570,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 4562 +size: 4615 location: clients/tests/test-client.py:1014:test_004()/69 cmd: $NMCLI --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 4414 bytes +stdout: 4467 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -3587,6 +3599,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -3659,12 +3672,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 4590 +size: 4643 location: clients/tests/test-client.py:1014:test_004()/70 cmd: $NMCLI --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4432 bytes +stdout: 4485 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -3688,6 +3701,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -3760,12 +3774,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 4562 +size: 4615 location: clients/tests/test-client.py:1016:test_004()/71 cmd: $NMCLI --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 4414 bytes +stdout: 4467 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -3789,6 +3803,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -3861,12 +3876,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 4590 +size: 4643 location: clients/tests/test-client.py:1016:test_004()/72 cmd: $NMCLI --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4432 bytes +stdout: 4485 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -3890,6 +3905,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -3962,12 +3978,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 3481 +size: 3534 location: clients/tests/test-client.py:1019:test_004()/73 cmd: $NMCLI --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 3326 bytes +stdout: 3379 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -3991,6 +4007,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -4043,12 +4060,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 3501 +size: 3554 location: clients/tests/test-client.py:1019:test_004()/74 cmd: $NMCLI --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3336 bytes +stdout: 3389 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -4072,6 +4089,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -6402,12 +6420,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 5572 +size: 5625 location: clients/tests/test-client.py:1014:test_004()/115 cmd: $NMCLI --pretty con s con-vpn-1 lang: C returncode: 0 -stdout: 5426 bytes +stdout: 5479 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -6434,6 +6452,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- ipv4.method: auto ipv4.dns: -- @@ -6516,12 +6535,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 5612 +size: 5665 location: clients/tests/test-client.py:1014:test_004()/116 cmd: $NMCLI --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5456 bytes +stdout: 5509 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -6548,6 +6567,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- ipv4.method: auto ipv4.dns: -- @@ -6630,12 +6650,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 5572 +size: 5625 location: clients/tests/test-client.py:1016:test_004()/117 cmd: $NMCLI --pretty con s con-vpn-1 lang: C returncode: 0 -stdout: 5426 bytes +stdout: 5479 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -6662,6 +6682,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- ipv4.method: auto ipv4.dns: -- @@ -6744,12 +6765,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 5612 +size: 5665 location: clients/tests/test-client.py:1016:test_004()/118 cmd: $NMCLI --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5456 bytes +stdout: 5509 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -6776,6 +6797,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- ipv4.method: auto ipv4.dns: -- @@ -6858,12 +6880,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 4098 +size: 4151 location: clients/tests/test-client.py:1019:test_004()/119 cmd: $NMCLI --pretty -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 3945 bytes +stdout: 3998 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -6890,6 +6912,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- ipv4.method: auto ipv4.dns: -- @@ -6947,12 +6970,12 @@ proxy.pac-script: -- ------------------------------------------------------------------------------- <<< -size: 4123 +size: 4176 location: clients/tests/test-client.py:1019:test_004()/120 cmd: $NMCLI --pretty -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3960 bytes +stdout: 4013 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -6979,6 +7002,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- ipv4.method: auto ipv4.dns: -- @@ -9848,12 +9872,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -size: 5584 +size: 5637 location: clients/tests/test-client.py:1014:test_004()/161 cmd: $NMCLI --pretty --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 5426 bytes +stdout: 5479 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -9880,6 +9904,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- ipv4.method: auto ipv4.dns: -- @@ -9962,12 +9987,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 5624 +size: 5677 location: clients/tests/test-client.py:1014:test_004()/162 cmd: $NMCLI --pretty --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5456 bytes +stdout: 5509 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -9994,6 +10019,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- ipv4.method: auto ipv4.dns: -- @@ -10076,12 +10102,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 5584 +size: 5637 location: clients/tests/test-client.py:1016:test_004()/163 cmd: $NMCLI --pretty --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 5426 bytes +stdout: 5479 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -10108,6 +10134,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- ipv4.method: auto ipv4.dns: -- @@ -10190,12 +10217,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 5624 +size: 5677 location: clients/tests/test-client.py:1016:test_004()/164 cmd: $NMCLI --pretty --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5456 bytes +stdout: 5509 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -10222,6 +10249,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- ipv4.method: auto ipv4.dns: -- @@ -10304,12 +10332,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 4110 +size: 4163 location: clients/tests/test-client.py:1019:test_004()/165 cmd: $NMCLI --pretty --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 3945 bytes +stdout: 3998 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -10336,6 +10364,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- ipv4.method: auto ipv4.dns: -- @@ -10393,12 +10422,12 @@ proxy.pac-script: -- ------------------------------------------------------------------------------- <<< -size: 4135 +size: 4188 location: clients/tests/test-client.py:1019:test_004()/166 cmd: $NMCLI --pretty --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3960 bytes +stdout: 4013 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -10425,6 +10454,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- ipv4.method: auto ipv4.dns: -- @@ -13294,12 +13324,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -size: 2303 +size: 2323 location: clients/tests/test-client.py:1014:test_004()/207 cmd: $NMCLI --terse con s con-vpn-1 lang: C returncode: 0 -stdout: 2158 bytes +stdout: 2178 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -13323,6 +13353,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 ipv4.method:auto ipv4.dns: ipv4.dns-search: @@ -13395,12 +13426,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2313 +size: 2333 location: clients/tests/test-client.py:1014:test_004()/208 cmd: $NMCLI --terse con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2158 bytes +stdout: 2178 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -13424,6 +13455,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 ipv4.method:auto ipv4.dns: ipv4.dns-search: @@ -13496,12 +13528,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2303 +size: 2323 location: clients/tests/test-client.py:1016:test_004()/209 cmd: $NMCLI --terse con s con-vpn-1 lang: C returncode: 0 -stdout: 2158 bytes +stdout: 2178 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -13525,6 +13557,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 ipv4.method:auto ipv4.dns: ipv4.dns-search: @@ -13597,12 +13630,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2313 +size: 2333 location: clients/tests/test-client.py:1016:test_004()/210 cmd: $NMCLI --terse con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2158 bytes +stdout: 2178 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -13626,6 +13659,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 ipv4.method:auto ipv4.dns: ipv4.dns-search: @@ -13698,12 +13732,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 1751 +size: 1771 location: clients/tests/test-client.py:1019:test_004()/211 cmd: $NMCLI --terse -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 1599 bytes +stdout: 1619 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -13727,6 +13761,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 ipv4.method:auto ipv4.dns: ipv4.dns-search: @@ -13779,12 +13814,12 @@ proxy.pac-url: proxy.pac-script: <<< -size: 1761 +size: 1781 location: clients/tests/test-client.py:1019:test_004()/212 cmd: $NMCLI --terse -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1599 bytes +stdout: 1619 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -13808,6 +13843,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 ipv4.method:auto ipv4.dns: ipv4.dns-search: @@ -16108,12 +16144,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 2315 +size: 2335 location: clients/tests/test-client.py:1014:test_004()/253 cmd: $NMCLI --terse --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 2158 bytes +stdout: 2178 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -16137,6 +16173,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 ipv4.method:auto ipv4.dns: ipv4.dns-search: @@ -16209,12 +16246,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2325 +size: 2345 location: clients/tests/test-client.py:1014:test_004()/254 cmd: $NMCLI --terse --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2158 bytes +stdout: 2178 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -16238,6 +16275,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 ipv4.method:auto ipv4.dns: ipv4.dns-search: @@ -16310,12 +16348,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2315 +size: 2335 location: clients/tests/test-client.py:1016:test_004()/255 cmd: $NMCLI --terse --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 2158 bytes +stdout: 2178 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -16339,6 +16377,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 ipv4.method:auto ipv4.dns: ipv4.dns-search: @@ -16411,12 +16450,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2325 +size: 2345 location: clients/tests/test-client.py:1016:test_004()/256 cmd: $NMCLI --terse --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2158 bytes +stdout: 2178 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -16440,6 +16479,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 ipv4.method:auto ipv4.dns: ipv4.dns-search: @@ -16512,12 +16552,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 1763 +size: 1783 location: clients/tests/test-client.py:1019:test_004()/257 cmd: $NMCLI --terse --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 1599 bytes +stdout: 1619 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -16541,6 +16581,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 ipv4.method:auto ipv4.dns: ipv4.dns-search: @@ -16593,12 +16634,12 @@ proxy.pac-url: proxy.pac-script: <<< -size: 1773 +size: 1793 location: clients/tests/test-client.py:1019:test_004()/258 cmd: $NMCLI --terse --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1599 bytes +stdout: 1619 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -16622,6 +16663,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 ipv4.method:auto ipv4.dns: ipv4.dns-search: @@ -18922,15 +18964,15 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 2950 +size: 2978 location: clients/tests/test-client.py:1014:test_004()/299 cmd: $NMCLI --mode tabular con s con-vpn-1 lang: C returncode: 0 -stdout: 2798 bytes +stdout: 2826 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 -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) +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 +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) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default) @@ -18951,15 +18993,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: 2971 +size: 2999 location: clients/tests/test-client.py:1014:test_004()/300 cmd: $NMCLI --mode tabular con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2809 bytes +stdout: 2837 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 -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) +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 +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) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default) @@ -18980,15 +19022,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: 2950 +size: 2978 location: clients/tests/test-client.py:1016:test_004()/301 cmd: $NMCLI --mode tabular con s con-vpn-1 lang: C returncode: 0 -stdout: 2798 bytes +stdout: 2826 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 -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) +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 +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) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default) @@ -19009,15 +19051,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: 2971 +size: 2999 location: clients/tests/test-client.py:1016:test_004()/302 cmd: $NMCLI --mode tabular con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2809 bytes +stdout: 2837 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 -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) +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 +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) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default) @@ -19038,15 +19080,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: 2218 +size: 2246 location: clients/tests/test-client.py:1019:test_004()/303 cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 2059 bytes +stdout: 2087 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 -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) +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 +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) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default) @@ -19062,15 +19104,15 @@ proxy none no -- -- <<< -size: 2230 +size: 2258 location: clients/tests/test-client.py:1019:test_004()/304 cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2061 bytes +stdout: 2089 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 -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) +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 +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) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default) @@ -20398,15 +20440,15 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 2962 +size: 2990 location: clients/tests/test-client.py:1014:test_004()/345 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 2798 bytes +stdout: 2826 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 -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) +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 +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) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default) @@ -20427,15 +20469,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: 2983 +size: 3011 location: clients/tests/test-client.py:1014:test_004()/346 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2809 bytes +stdout: 2837 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 -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) +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 +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) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default) @@ -20456,15 +20498,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: 2962 +size: 2990 location: clients/tests/test-client.py:1016:test_004()/347 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 2798 bytes +stdout: 2826 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 -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) +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 +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) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default) @@ -20485,15 +20527,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: 2983 +size: 3011 location: clients/tests/test-client.py:1016:test_004()/348 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2809 bytes +stdout: 2837 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 -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) +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 +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) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default) @@ -20514,15 +20556,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: 2230 +size: 2258 location: clients/tests/test-client.py:1019:test_004()/349 cmd: $NMCLI --mode tabular --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 2059 bytes +stdout: 2087 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 -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) +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 +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) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default) @@ -20538,15 +20580,15 @@ proxy none no -- -- <<< -size: 2242 +size: 2270 location: clients/tests/test-client.py:1019:test_004()/350 cmd: $NMCLI --mode tabular --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2061 bytes +stdout: 2089 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 -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) +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 +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) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default) @@ -21874,19 +21916,19 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 4700 +size: 4742 location: clients/tests/test-client.py:1014:test_004()/391 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1 lang: C returncode: 0 -stdout: 4539 bytes +stdout: 4581 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 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -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) +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 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +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) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -21916,19 +21958,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: 4754 +size: 4796 location: clients/tests/test-client.py:1014:test_004()/392 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4583 bytes +stdout: 4625 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 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -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) +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 +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +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) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -21958,19 +22000,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: 4700 +size: 4742 location: clients/tests/test-client.py:1016:test_004()/393 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1 lang: C returncode: 0 -stdout: 4539 bytes +stdout: 4581 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 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -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) +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 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +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) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -22000,19 +22042,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: 4754 +size: 4796 location: clients/tests/test-client.py:1016:test_004()/394 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4583 bytes +stdout: 4625 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 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -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) +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 +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +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) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -22042,19 +22084,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: 3386 +size: 3428 location: clients/tests/test-client.py:1019:test_004()/395 cmd: $NMCLI --mode tabular --pretty -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 3218 bytes +stdout: 3260 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 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -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) +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 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +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) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -22074,19 +22116,19 @@ proxy none no -- -- <<< -size: 3409 +size: 3451 location: clients/tests/test-client.py:1019:test_004()/396 cmd: $NMCLI --mode tabular --pretty -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3231 bytes +stdout: 3273 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 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -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) +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 +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +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) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -23938,19 +23980,19 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 4712 +size: 4754 location: clients/tests/test-client.py:1014:test_004()/437 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 4539 bytes +stdout: 4581 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 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -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) +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 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +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) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -23980,19 +24022,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: 4766 +size: 4808 location: clients/tests/test-client.py:1014:test_004()/438 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4583 bytes +stdout: 4625 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 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -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) +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 +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +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) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -24022,19 +24064,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: 4712 +size: 4754 location: clients/tests/test-client.py:1016:test_004()/439 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 4539 bytes +stdout: 4581 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 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -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) +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 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +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) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -24064,19 +24106,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: 4766 +size: 4808 location: clients/tests/test-client.py:1016:test_004()/440 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4583 bytes +stdout: 4625 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 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -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) +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 +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +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) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -24106,19 +24148,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: 3398 +size: 3440 location: clients/tests/test-client.py:1019:test_004()/441 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 3218 bytes +stdout: 3260 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 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -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) +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 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +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) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -24138,19 +24180,19 @@ proxy none no -- -- <<< -size: 3421 +size: 3463 location: clients/tests/test-client.py:1019:test_004()/442 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3231 bytes +stdout: 3273 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 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -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) +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 +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +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) name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -26002,14 +26044,14 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 788 +size: 791 location: clients/tests/test-client.py:1014:test_004()/483 cmd: $NMCLI --mode tabular --terse con s con-vpn-1 lang: C returncode: 0 -stdout: 629 bytes +stdout: 632 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 +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 ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3::no:0 @@ -26018,14 +26060,14 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::ye VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 798 +size: 801 location: clients/tests/test-client.py:1014:test_004()/484 cmd: $NMCLI --mode tabular --terse con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 629 bytes +stdout: 632 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 +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 ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3::no:0 @@ -26034,14 +26076,14 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::ye VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 788 +size: 791 location: clients/tests/test-client.py:1016:test_004()/485 cmd: $NMCLI --mode tabular --terse con s con-vpn-1 lang: C returncode: 0 -stdout: 629 bytes +stdout: 632 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 +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 ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3::no:0 @@ -26050,14 +26092,14 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::ye VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 798 +size: 801 location: clients/tests/test-client.py:1016:test_004()/486 cmd: $NMCLI --mode tabular --terse con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 629 bytes +stdout: 632 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 +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 ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3::no:0 @@ -26066,28 +26108,28 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::ye VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 501 +size: 504 location: clients/tests/test-client.py:1019:test_004()/487 cmd: $NMCLI --mode tabular --terse -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 335 bytes +stdout: 338 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 +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 ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3::no:0 proxy:none:no:: <<< -size: 511 +size: 514 location: clients/tests/test-client.py:1019:test_004()/488 cmd: $NMCLI --mode tabular --terse -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 335 bytes +stdout: 338 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 +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 ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3::no:0 @@ -26842,14 +26884,14 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 800 +size: 803 location: clients/tests/test-client.py:1014:test_004()/529 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 629 bytes +stdout: 632 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 +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 ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3::no:0 @@ -26858,14 +26900,14 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::ye VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 810 +size: 813 location: clients/tests/test-client.py:1014:test_004()/530 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 629 bytes +stdout: 632 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 +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 ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3::no:0 @@ -26874,14 +26916,14 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::ye VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 800 +size: 803 location: clients/tests/test-client.py:1016:test_004()/531 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 629 bytes +stdout: 632 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 +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 ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3::no:0 @@ -26890,14 +26932,14 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::ye VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 810 +size: 813 location: clients/tests/test-client.py:1016:test_004()/532 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 629 bytes +stdout: 632 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 +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 ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3::no:0 @@ -26906,28 +26948,28 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::ye VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3 <<< -size: 513 +size: 516 location: clients/tests/test-client.py:1019:test_004()/533 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 335 bytes +stdout: 338 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 +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 ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3::no:0 proxy:none:no:: <<< -size: 523 +size: 526 location: clients/tests/test-client.py:1019:test_004()/534 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 335 bytes +stdout: 338 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 +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 ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3::no:0 @@ -27682,12 +27724,12 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 4568 +size: 4621 location: clients/tests/test-client.py:1014:test_004()/575 cmd: $NMCLI --mode multiline con s con-vpn-1 lang: C returncode: 0 -stdout: 4414 bytes +stdout: 4467 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -27711,6 +27753,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -27783,12 +27826,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 4596 +size: 4649 location: clients/tests/test-client.py:1014:test_004()/576 cmd: $NMCLI --mode multiline con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4432 bytes +stdout: 4485 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -27812,6 +27855,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -27884,12 +27928,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 4568 +size: 4621 location: clients/tests/test-client.py:1016:test_004()/577 cmd: $NMCLI --mode multiline con s con-vpn-1 lang: C returncode: 0 -stdout: 4414 bytes +stdout: 4467 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -27913,6 +27957,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -27985,12 +28030,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 4596 +size: 4649 location: clients/tests/test-client.py:1016:test_004()/578 cmd: $NMCLI --mode multiline con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4432 bytes +stdout: 4485 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -28014,6 +28059,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -28086,12 +28132,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 3487 +size: 3540 location: clients/tests/test-client.py:1019:test_004()/579 cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 3326 bytes +stdout: 3379 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -28115,6 +28161,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -28167,12 +28214,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 3507 +size: 3560 location: clients/tests/test-client.py:1019:test_004()/580 cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3336 bytes +stdout: 3389 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -28196,6 +28243,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -30996,12 +31044,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 4580 +size: 4633 location: clients/tests/test-client.py:1014:test_004()/621 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 4414 bytes +stdout: 4467 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -31025,6 +31073,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -31097,12 +31146,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 4608 +size: 4661 location: clients/tests/test-client.py:1014:test_004()/622 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4432 bytes +stdout: 4485 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -31126,6 +31175,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -31198,12 +31248,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 4580 +size: 4633 location: clients/tests/test-client.py:1016:test_004()/623 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 4414 bytes +stdout: 4467 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -31227,6 +31277,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -31299,12 +31350,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 4608 +size: 4661 location: clients/tests/test-client.py:1016:test_004()/624 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4432 bytes +stdout: 4485 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -31328,6 +31379,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -31400,12 +31452,12 @@ VPN.CFG[2]: key2 = val2 VPN.CFG[3]: key3 = val3 <<< -size: 3499 +size: 3552 location: clients/tests/test-client.py:1019:test_004()/625 cmd: $NMCLI --mode multiline --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 3326 bytes +stdout: 3379 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -31429,6 +31481,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -31481,12 +31534,12 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -size: 3519 +size: 3572 location: clients/tests/test-client.py:1019:test_004()/626 cmd: $NMCLI --mode multiline --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3336 bytes +stdout: 3389 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -31510,6 +31563,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ipv4.method: auto ipv4.dns: -- ipv4.dns-search: -- @@ -34310,12 +34364,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 5589 +size: 5642 location: clients/tests/test-client.py:1014:test_004()/667 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1 lang: C returncode: 0 -stdout: 5426 bytes +stdout: 5479 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -34342,6 +34396,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- ipv4.method: auto ipv4.dns: -- @@ -34424,12 +34479,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 5629 +size: 5682 location: clients/tests/test-client.py:1014:test_004()/668 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5456 bytes +stdout: 5509 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -34456,6 +34511,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- ipv4.method: auto ipv4.dns: -- @@ -34538,12 +34594,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 5589 +size: 5642 location: clients/tests/test-client.py:1016:test_004()/669 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1 lang: C returncode: 0 -stdout: 5426 bytes +stdout: 5479 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -34570,6 +34626,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- ipv4.method: auto ipv4.dns: -- @@ -34652,12 +34709,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 5629 +size: 5682 location: clients/tests/test-client.py:1016:test_004()/670 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5456 bytes +stdout: 5509 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -34684,6 +34741,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- ipv4.method: auto ipv4.dns: -- @@ -34766,12 +34824,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 4115 +size: 4168 location: clients/tests/test-client.py:1019:test_004()/671 cmd: $NMCLI --mode multiline --pretty -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 3945 bytes +stdout: 3998 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -34798,6 +34856,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- ipv4.method: auto ipv4.dns: -- @@ -34855,12 +34914,12 @@ proxy.pac-script: -- ------------------------------------------------------------------------------- <<< -size: 4140 +size: 4193 location: clients/tests/test-client.py:1019:test_004()/672 cmd: $NMCLI --mode multiline --pretty -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3960 bytes +stdout: 4013 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -34887,6 +34946,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- ipv4.method: auto ipv4.dns: -- @@ -38256,12 +38316,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -size: 5601 +size: 5654 location: clients/tests/test-client.py:1014:test_004()/713 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 5426 bytes +stdout: 5479 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -38288,6 +38348,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- ipv4.method: auto ipv4.dns: -- @@ -38370,12 +38431,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 5641 +size: 5694 location: clients/tests/test-client.py:1014:test_004()/714 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5456 bytes +stdout: 5509 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -38402,6 +38463,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- ipv4.method: auto ipv4.dns: -- @@ -38484,12 +38546,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 5601 +size: 5654 location: clients/tests/test-client.py:1016:test_004()/715 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 5426 bytes +stdout: 5479 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -38516,6 +38578,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- ipv4.method: auto ipv4.dns: -- @@ -38598,12 +38661,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 5641 +size: 5694 location: clients/tests/test-client.py:1016:test_004()/716 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5456 bytes +stdout: 5509 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -38630,6 +38693,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- ipv4.method: auto ipv4.dns: -- @@ -38712,12 +38776,12 @@ VPN.CFG[3]: key3 = val3 ------------------------------------------------------------------------------- <<< -size: 4127 +size: 4180 location: clients/tests/test-client.py:1019:test_004()/717 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 3945 bytes +stdout: 3998 bytes >>> =============================================================================== Connection profile details (con-vpn-1) @@ -38744,6 +38808,7 @@ connection.gateway-ping-timeout: 0 connection.metered: unknown connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- ipv4.method: auto ipv4.dns: -- @@ -38801,12 +38866,12 @@ proxy.pac-script: -- ------------------------------------------------------------------------------- <<< -size: 4152 +size: 4205 location: clients/tests/test-client.py:1019:test_004()/718 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3960 bytes +stdout: 4013 bytes >>> =============================================================================== Szczegóły profilu połączenia (con-vpn-1) @@ -38833,6 +38898,7 @@ connection.gateway-ping-timeout: 0 connection.metered: nieznane connection.lldp: default connection.mdns: -1 (default) +connection.llmnr: -1 (default) ------------------------------------------------------------------------------- ipv4.method: auto ipv4.dns: -- @@ -42202,12 +42268,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -size: 2320 +size: 2340 location: clients/tests/test-client.py:1014:test_004()/759 cmd: $NMCLI --mode multiline --terse con s con-vpn-1 lang: C returncode: 0 -stdout: 2158 bytes +stdout: 2178 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -42231,6 +42297,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 ipv4.method:auto ipv4.dns: ipv4.dns-search: @@ -42303,12 +42370,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2330 +size: 2350 location: clients/tests/test-client.py:1014:test_004()/760 cmd: $NMCLI --mode multiline --terse con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2158 bytes +stdout: 2178 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -42332,6 +42399,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 ipv4.method:auto ipv4.dns: ipv4.dns-search: @@ -42404,12 +42472,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2320 +size: 2340 location: clients/tests/test-client.py:1016:test_004()/761 cmd: $NMCLI --mode multiline --terse con s con-vpn-1 lang: C returncode: 0 -stdout: 2158 bytes +stdout: 2178 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -42433,6 +42501,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 ipv4.method:auto ipv4.dns: ipv4.dns-search: @@ -42505,12 +42574,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2330 +size: 2350 location: clients/tests/test-client.py:1016:test_004()/762 cmd: $NMCLI --mode multiline --terse con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2158 bytes +stdout: 2178 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -42534,6 +42603,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 ipv4.method:auto ipv4.dns: ipv4.dns-search: @@ -42606,12 +42676,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 1768 +size: 1788 location: clients/tests/test-client.py:1019:test_004()/763 cmd: $NMCLI --mode multiline --terse -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 1599 bytes +stdout: 1619 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -42635,6 +42705,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 ipv4.method:auto ipv4.dns: ipv4.dns-search: @@ -42687,12 +42758,12 @@ proxy.pac-url: proxy.pac-script: <<< -size: 1778 +size: 1798 location: clients/tests/test-client.py:1019:test_004()/764 cmd: $NMCLI --mode multiline --terse -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1599 bytes +stdout: 1619 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -42716,6 +42787,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 ipv4.method:auto ipv4.dns: ipv4.dns-search: @@ -45516,12 +45588,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -size: 2332 +size: 2352 location: clients/tests/test-client.py:1014:test_004()/805 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 2158 bytes +stdout: 2178 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -45545,6 +45617,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 ipv4.method:auto ipv4.dns: ipv4.dns-search: @@ -45617,12 +45690,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2342 +size: 2362 location: clients/tests/test-client.py:1014:test_004()/806 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2158 bytes +stdout: 2178 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -45646,6 +45719,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 ipv4.method:auto ipv4.dns: ipv4.dns-search: @@ -45718,12 +45792,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2332 +size: 2352 location: clients/tests/test-client.py:1016:test_004()/807 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1 lang: C returncode: 0 -stdout: 2158 bytes +stdout: 2178 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -45747,6 +45821,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 ipv4.method:auto ipv4.dns: ipv4.dns-search: @@ -45819,12 +45894,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 2342 +size: 2362 location: clients/tests/test-client.py:1016:test_004()/808 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2158 bytes +stdout: 2178 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -45848,6 +45923,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 ipv4.method:auto ipv4.dns: ipv4.dns-search: @@ -45920,12 +45996,12 @@ VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 <<< -size: 1780 +size: 1800 location: clients/tests/test-client.py:1019:test_004()/809 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 1599 bytes +stdout: 1619 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -45949,6 +46025,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 ipv4.method:auto ipv4.dns: ipv4.dns-search: @@ -46001,12 +46078,12 @@ proxy.pac-url: proxy.pac-script: <<< -size: 1790 +size: 1810 location: clients/tests/test-client.py:1019:test_004()/810 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1599 bytes +stdout: 1619 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -46030,6 +46107,7 @@ connection.gateway-ping-timeout:0 connection.metered:unknown connection.lldp:default connection.mdns:-1 +connection.llmnr:-1 ipv4.method:auto ipv4.dns: ipv4.dns-search: From 44d77a7476db542a3ce6206785a170436ec82510 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Fri, 31 Aug 2018 15:18:20 +0200 Subject: [PATCH 6/8] ifcfg-rh: add support for connection.llmnr --- libnm-core/nm-setting-connection.c | 9 +++++++++ src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 7 +++++++ src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c index 33fa921428..50240bc934 100644 --- a/libnm-core/nm-setting-connection.c +++ b/libnm-core/nm-setting-connection.c @@ -2181,6 +2181,15 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass) * * Since: 1.14 **/ + /* ---ifcfg-rh--- + * property: llmnr + * variable: LLMNR(+) + * values: yes,no,resolve + * default: missing variable means global default + * description: Whether or not LLMNR is enabled for the connection + * example: LLMNR=yes + * ---end--- + */ g_object_class_install_property (object_class, PROP_LLMNR, g_param_spec_int (NM_SETTING_CONNECTION_LLMNR, "", "", 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 2f38e16887..09a379914b 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c @@ -554,6 +554,13 @@ make_connection_setting (const char *file, PARSE_WARNING ("invalid MDNS setting"); g_object_set (s_con, NM_SETTING_CONNECTION_MDNS, i_val, NULL); + i_val = NM_SETTING_CONNECTION_LLMNR_DEFAULT; + if (!svGetValueEnum (ifcfg, "LLMNR", + nm_setting_connection_llmnr_get_type (), + &i_val, NULL)) + PARSE_WARNING ("invalid LLMNR setting"); + g_object_set (s_con, NM_SETTING_CONNECTION_LLMNR, i_val, NULL); + return NM_SETTING (s_con); } 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 530feba6ef..e1a2289e4d 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c @@ -1790,6 +1790,7 @@ write_connection_setting (NMSettingConnection *s_con, shvarFile *ifcfg) const char *master, *master_iface = NULL, *type; int vint; NMSettingConnectionMdns mdns; + NMSettingConnectionLlmnr llmnr; guint32 vuint32; const char *tmp; @@ -1960,6 +1961,13 @@ write_connection_setting (NMSettingConnection *s_con, shvarFile *ifcfg) mdns); } else svUnsetValue (ifcfg, "MDNS"); + + llmnr = nm_setting_connection_get_llmnr (s_con); + if (llmnr != NM_SETTING_CONNECTION_LLMNR_DEFAULT) { + svSetValueEnum (ifcfg, "LLMNR", nm_setting_connection_llmnr_get_type (), + llmnr); + } else + svUnsetValue (ifcfg, "LLMNR"); } static char * From 6169cd570f855eec80819dd2ac63324c65cbc598 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Fri, 31 Aug 2018 17:02:21 +0200 Subject: [PATCH 7/8] core: nm-ip4-config: consider dns-related differences as relevant The DNS manager reacts to NM_DEVICE_IP4_CONFIG_CHANGED events, which are generated when there is a relevant change to an IP4 configuration. Until now, changes to the mdns,llmnr properties were not considered relevant (and neither minor, this is already a bug). Promote them to relevant so that the DNS manager is notified and will rewrite the DNS configuration when one of this properties changes. Note that the DNS priority should be considered relevant and added into the checksum as well, but is a problem right now because in the DNS manager we rely on the fact that an empty configuration (i.e. just created) has a zero checksum. This is needed to avoid rewriting resolv.conf when there is no change. The DNS priority initial value depends on the connection type (VPN or not), so it's a bit difficult to add it to checksum maintaining the assumption of checksum(empty)=0. This should be improved in the future. --- src/dns/nm-dns-manager.c | 2 ++ src/nm-ip4-config.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c index 2a15bf5e46..6a59b41c7b 100644 --- a/src/dns/nm-dns-manager.c +++ b/src/dns/nm-dns-manager.c @@ -970,6 +970,8 @@ compute_hash (NMDnsManager *self, const NMGlobalDnsConfig *global, guint8 buffer else { const CList *head; + /* FIXME(ip-config-checksum): this relies on the fact that an IP + * configuration without DNS parameters gives a zero checksum. */ head = _ip_config_lst_head (self); c_list_for_each_entry (ip_data, head, ip_config_lst) nm_ip_config_hash (ip_data->ip_config, sum, TRUE); diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index 5f1004130c..573c479a92 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -1885,8 +1885,15 @@ nm_ip4_config_replace (NMIP4Config *dst, const NMIP4Config *src, gboolean *relev has_relevant_changes = TRUE; } - dst_priv->mdns = src_priv->mdns; - dst_priv->llmnr = src_priv->llmnr; + if (src_priv->mdns != dst_priv->mdns) { + dst_priv->mdns = src_priv->mdns; + has_relevant_changes = TRUE; + } + + if (src_priv->llmnr != dst_priv->llmnr) { + dst_priv->llmnr = src_priv->llmnr; + has_relevant_changes = TRUE; + } /* DNS priority */ if (src_priv->dns_priority != dst_priv->dns_priority) { @@ -2877,6 +2884,7 @@ nm_ip4_config_hash (const NMIP4Config *self, GChecksum *sum, gboolean dns_only) NMDedupMultiIter ipconf_iter; const NMPlatformIP4Address *address; const NMPlatformIP4Route *route; + int val; g_return_if_fail (self); g_return_if_fail (sum); @@ -2923,6 +2931,25 @@ nm_ip4_config_hash (const NMIP4Config *self, GChecksum *sum, gboolean dns_only) s = nm_ip4_config_get_dns_option (self, i); g_checksum_update (sum, (const guint8 *) s, strlen (s)); } + + val = nm_ip4_config_mdns_get (self); + if (val != NM_SETTING_CONNECTION_MDNS_DEFAULT) + g_checksum_update (sum, (const guint8 *) &val, sizeof (val)); + + val = nm_ip4_config_llmnr_get (self); + if (val != NM_SETTING_CONNECTION_LLMNR_DEFAULT) + g_checksum_update (sum, (const guint8 *) &val, sizeof (val)); + + /* FIXME(ip-config-checksum): the DNS priority should be considered relevant + * and added into the checksum as well, but this can't be done right now + * because in the DNS manager we rely on the fact that an empty + * configuration (i.e. just created) has a zero checksum. This is needed to + * avoid rewriting resolv.conf when there is no change. + * + * The DNS priority initial value depends on the connection type (VPN or + * not), so it's a bit difficult to add it to checksum maintaining the + * assumption of checksum(empty)=0 + */ } /** From 0cfbca53e4a619d0a9db3c5d786f4bf5569de4d4 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Fri, 31 Aug 2018 17:17:57 +0200 Subject: [PATCH 8/8] device: allow the reapply of mdns and llmnr properties --- src/devices/nm-device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 872f6c8f07..515e6334a2 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -10879,7 +10879,9 @@ can_reapply_change (NMDevice *self, const char *setting_name, NM_SETTING_CONNECTION_AUTOCONNECT, NM_SETTING_CONNECTION_ZONE, NM_SETTING_CONNECTION_METERED, - NM_SETTING_CONNECTION_LLDP); + NM_SETTING_CONNECTION_LLDP, + NM_SETTING_CONNECTION_MDNS, + NM_SETTING_CONNECTION_LLMNR); } else if (NM_IN_STRSET (setting_name, NM_SETTING_PROXY_SETTING_NAME)) { return TRUE;