From 8f7a3cbbdd0c0a48277c341dd3a8ec8743ae9735 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 8 Sep 2018 17:44:06 +0200 Subject: New upstream version 1.13.90 --- src/vpn/nm-vpn-connection.c | 30 ++++++++++++++---------------- src/vpn/nm-vpn-connection.h | 2 +- 2 files changed, 15 insertions(+), 17 deletions(-) (limited to 'src/vpn') diff --git a/src/vpn/nm-vpn-connection.c b/src/vpn/nm-vpn-connection.c index ad752c4c..d1aaa7c9 100644 --- a/src/vpn/nm-vpn-connection.c +++ b/src/vpn/nm-vpn-connection.c @@ -193,7 +193,7 @@ static void _set_vpn_state (NMVpnConnection *self, #define __NMLOG_prefix_buf_len 128 static const char * -__LOG_create_prefix (char *buf, NMVpnConnection *self, NMConnection *con) +__LOG_create_prefix (char *buf, NMVpnConnection *self, NMSettingsConnection *con) { NMVpnConnectionPrivate *priv; const char *id; @@ -202,7 +202,7 @@ __LOG_create_prefix (char *buf, NMVpnConnection *self, NMConnection *con) return _NMLOG_PREFIX_NAME; priv = NM_VPN_CONNECTION_GET_PRIVATE (self); - id = con ? nm_connection_get_id (con) : NULL; + id = con ? nm_settings_connection_get_id (con) : NULL; g_snprintf (buf, __NMLOG_prefix_buf_len, "%s[" @@ -214,7 +214,7 @@ __LOG_create_prefix (char *buf, NMVpnConnection *self, NMConnection *con) "]", _NMLOG_PREFIX_NAME, self, - con ? "," : "--", con ? (nm_connection_get_uuid (con) ?: "??") : "", + con ? "," : "--", con ? (nm_settings_connection_get_uuid (con) ?: "??") : "", con ? "," : "", NM_PRINT_FMT_QUOTED (id, "\"", id, "\"", con ? "??" : ""), priv->ip_ifindex, NM_PRINT_FMT_QUOTED (priv->ip_iface, ":(", priv->ip_iface, ")", "") @@ -225,17 +225,17 @@ __LOG_create_prefix (char *buf, NMVpnConnection *self, NMConnection *con) #define _NMLOG(level, ...) \ G_STMT_START { \ - const NMLogLevel __level = (level); \ - NMConnection *__con = (self) ? (NMConnection *) _get_settings_connection (self, TRUE) : NULL; \ + const NMLogLevel _level = (level); \ + NMSettingsConnection *_con = (self) ? _get_settings_connection (self, TRUE) : NULL; \ \ - if (nm_logging_enabled (__level, _NMLOG_DOMAIN)) { \ + if (nm_logging_enabled (_level, _NMLOG_DOMAIN)) { \ char __prefix[__NMLOG_prefix_buf_len]; \ \ - _nm_log (__level, _NMLOG_DOMAIN, 0, \ + _nm_log (_level, _NMLOG_DOMAIN, 0, \ (self) ? NM_VPN_CONNECTION_GET_PRIVATE (self)->ip_iface : NULL, \ - (__con) ? nm_connection_get_uuid (__con) : NULL, \ + (_con) ? nm_settings_connection_get_uuid (_con) : NULL, \ "%s: " _NM_UTILS_MACRO_FIRST (__VA_ARGS__), \ - __LOG_create_prefix (__prefix, (self), __con) \ + __LOG_create_prefix (__prefix, (self), _con) \ _NM_UTILS_MACRO_REST (__VA_ARGS__)); \ } \ } G_STMT_END @@ -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); @@ -1876,13 +1877,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); diff --git a/src/vpn/nm-vpn-connection.h b/src/vpn/nm-vpn-connection.h index 3046634d..e409cc31 100644 --- a/src/vpn/nm-vpn-connection.h +++ b/src/vpn/nm-vpn-connection.h @@ -59,7 +59,7 @@ void nm_vpn_connection_activate (NMVpnConnection *self, NMVpnPluginInfo *plugin_info); NMVpnConnectionState nm_vpn_connection_get_vpn_state (NMVpnConnection *self); const char * nm_vpn_connection_get_banner (NMVpnConnection *self); -const gchar * nm_vpn_connection_get_service (NMVpnConnection *self); +const char * nm_vpn_connection_get_service (NMVpnConnection *self); gboolean nm_vpn_connection_deactivate (NMVpnConnection *self, NMActiveConnectionStateReason reason, -- cgit 1.3.0-6-gf8a5 From c240974325c552cad177c457d6ff04e381fd77a3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 15 Sep 2018 01:04:32 +0200 Subject: New upstream version 1.14.0 --- src/vpn/nm-vpn-connection.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/vpn') diff --git a/src/vpn/nm-vpn-connection.c b/src/vpn/nm-vpn-connection.c index d1aaa7c9..bd847d75 100644 --- a/src/vpn/nm-vpn-connection.c +++ b/src/vpn/nm-vpn-connection.c @@ -2684,12 +2684,16 @@ plugin_interactive_secrets_required (NMVpnConnection *self, gs_free const char **hints = NULL; gs_free char *message_hint = NULL; + if (!NM_IN_SET (priv->vpn_state, STATE_CONNECT, + STATE_NEED_AUTH)) { + _LOGD ("VPN plugin: requested secrets; state %s (%d); ignore request in current state", + vpn_state_to_string (priv->vpn_state), priv->vpn_state); + return; + } + _LOGI ("VPN plugin: requested secrets; state %s (%d)", vpn_state_to_string (priv->vpn_state), priv->vpn_state); - g_return_if_fail (priv->vpn_state == STATE_CONNECT || - priv->vpn_state == STATE_NEED_AUTH); - priv->secrets_idx = SECRETS_REQ_INTERACTIVE; _set_vpn_state (self, STATE_NEED_AUTH, NM_ACTIVE_CONNECTION_STATE_REASON_NONE, FALSE); @@ -2756,6 +2760,9 @@ dispose (GObject *object) NMVpnConnection *self = NM_VPN_CONNECTION (object); NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); + if (priv->proxy) + g_signal_handlers_disconnect_by_data (priv->proxy, self); + nm_clear_g_source (&priv->start_timeout); g_clear_pointer (&priv->connect_hash, g_variant_unref); -- cgit 1.3.0-6-gf8a5 From e126f3e804c35480c4f075777430419d6ece23da Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 23 Sep 2018 10:10:27 +0200 Subject: New upstream version 1.12.4 --- src/vpn/nm-vpn-connection.c | 30 ++++++++++++++++-------------- src/vpn/nm-vpn-connection.h | 2 +- 2 files changed, 17 insertions(+), 15 deletions(-) (limited to 'src/vpn') diff --git a/src/vpn/nm-vpn-connection.c b/src/vpn/nm-vpn-connection.c index bd847d75..91acf07e 100644 --- a/src/vpn/nm-vpn-connection.c +++ b/src/vpn/nm-vpn-connection.c @@ -193,7 +193,7 @@ static void _set_vpn_state (NMVpnConnection *self, #define __NMLOG_prefix_buf_len 128 static const char * -__LOG_create_prefix (char *buf, NMVpnConnection *self, NMSettingsConnection *con) +__LOG_create_prefix (char *buf, NMVpnConnection *self, NMConnection *con) { NMVpnConnectionPrivate *priv; const char *id; @@ -202,7 +202,7 @@ __LOG_create_prefix (char *buf, NMVpnConnection *self, NMSettingsConnection *con return _NMLOG_PREFIX_NAME; priv = NM_VPN_CONNECTION_GET_PRIVATE (self); - id = con ? nm_settings_connection_get_id (con) : NULL; + id = con ? nm_connection_get_id (con) : NULL; g_snprintf (buf, __NMLOG_prefix_buf_len, "%s[" @@ -214,7 +214,7 @@ __LOG_create_prefix (char *buf, NMVpnConnection *self, NMSettingsConnection *con "]", _NMLOG_PREFIX_NAME, self, - con ? "," : "--", con ? (nm_settings_connection_get_uuid (con) ?: "??") : "", + con ? "," : "--", con ? (nm_connection_get_uuid (con) ?: "??") : "", con ? "," : "", NM_PRINT_FMT_QUOTED (id, "\"", id, "\"", con ? "??" : ""), priv->ip_ifindex, NM_PRINT_FMT_QUOTED (priv->ip_iface, ":(", priv->ip_iface, ")", "") @@ -225,17 +225,17 @@ __LOG_create_prefix (char *buf, NMVpnConnection *self, NMSettingsConnection *con #define _NMLOG(level, ...) \ G_STMT_START { \ - const NMLogLevel _level = (level); \ - NMSettingsConnection *_con = (self) ? _get_settings_connection (self, TRUE) : NULL; \ + const NMLogLevel __level = (level); \ + NMConnection *__con = (self) ? (NMConnection *) _get_settings_connection (self, TRUE) : NULL; \ \ - if (nm_logging_enabled (_level, _NMLOG_DOMAIN)) { \ + if (nm_logging_enabled (__level, _NMLOG_DOMAIN)) { \ char __prefix[__NMLOG_prefix_buf_len]; \ \ - _nm_log (_level, _NMLOG_DOMAIN, 0, \ + _nm_log (__level, _NMLOG_DOMAIN, 0, \ (self) ? NM_VPN_CONNECTION_GET_PRIVATE (self)->ip_iface : NULL, \ - (_con) ? nm_settings_connection_get_uuid (_con) : NULL, \ + (__con) ? nm_connection_get_uuid (__con) : NULL, \ "%s: " _NM_UTILS_MACRO_FIRST (__VA_ARGS__), \ - __LOG_create_prefix (__prefix, (self), _con) \ + __LOG_create_prefix (__prefix, (self), __con) \ _NM_UTILS_MACRO_REST (__VA_ARGS__)); \ } \ } G_STMT_END @@ -1619,7 +1619,6 @@ 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); @@ -1877,10 +1876,13 @@ connect_success (NMVpnConnection *self) * It is a configured value or 60 seconds */ timeout = nm_setting_vpn_get_timeout (s_vpn); if (timeout == 0) { - timeout = nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA, - "vpn.timeout", - NULL, - 1, G_MAXUINT32, 60); + 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); } priv->connect_timeout = g_timeout_add_seconds (timeout, connect_timeout_cb, self); diff --git a/src/vpn/nm-vpn-connection.h b/src/vpn/nm-vpn-connection.h index e409cc31..3046634d 100644 --- a/src/vpn/nm-vpn-connection.h +++ b/src/vpn/nm-vpn-connection.h @@ -59,7 +59,7 @@ void nm_vpn_connection_activate (NMVpnConnection *self, NMVpnPluginInfo *plugin_info); NMVpnConnectionState nm_vpn_connection_get_vpn_state (NMVpnConnection *self); const char * nm_vpn_connection_get_banner (NMVpnConnection *self); -const char * nm_vpn_connection_get_service (NMVpnConnection *self); +const gchar * nm_vpn_connection_get_service (NMVpnConnection *self); gboolean nm_vpn_connection_deactivate (NMVpnConnection *self, NMActiveConnectionStateReason reason, -- cgit 1.3.0-6-gf8a5