zeus migration: networkmanager: update to use new version 1.18.4
https://jira.digi.com/browse/DEL-7013 Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
parent
f26a92fd5e
commit
8b67e57803
|
|
@ -11,17 +11,17 @@ interface.
|
||||||
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
|
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
|
||||||
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
|
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
|
||||||
---
|
---
|
||||||
shared/nm-dispatcher-api.h | 1 +
|
shared/nm-libnm-core-aux/nm-dispatcher-api.h | 1 +
|
||||||
src/devices/nm-device.c | 4 ++++
|
src/devices/nm-device.c | 4 ++
|
||||||
src/nm-dispatcher.c | 40 +++++++++++++++++++++++++++++++++++++-
|
src/nm-dispatcher.c | 40 +++++++++++++++++++-
|
||||||
src/nm-dispatcher.h | 10 +++++++++-
|
src/nm-dispatcher.h | 10 ++++-
|
||||||
4 files changed, 53 insertions(+), 2 deletions(-)
|
4 files changed, 53 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/shared/nm-dispatcher-api.h b/shared/nm-dispatcher-api.h
|
diff --git a/shared/nm-libnm-core-aux/nm-dispatcher-api.h b/shared/nm-libnm-core-aux/nm-dispatcher-api.h
|
||||||
index b1f28e71d..e83835b03 100644
|
index e6d0d92..123d737 100644
|
||||||
--- a/shared/nm-dispatcher-api.h
|
--- a/shared/nm-libnm-core-aux/nm-dispatcher-api.h
|
||||||
+++ b/shared/nm-dispatcher-api.h
|
+++ b/shared/nm-libnm-core-aux/nm-dispatcher-api.h
|
||||||
@@ -50,6 +50,7 @@
|
@@ -53,6 +53,7 @@
|
||||||
#define NMD_ACTION_DHCP4_CHANGE "dhcp4-change"
|
#define NMD_ACTION_DHCP4_CHANGE "dhcp4-change"
|
||||||
#define NMD_ACTION_DHCP6_CHANGE "dhcp6-change"
|
#define NMD_ACTION_DHCP6_CHANGE "dhcp6-change"
|
||||||
#define NMD_ACTION_CONNECTIVITY_CHANGE "connectivity-change"
|
#define NMD_ACTION_CONNECTIVITY_CHANGE "connectivity-change"
|
||||||
|
|
@ -30,25 +30,25 @@ index b1f28e71d..e83835b03 100644
|
||||||
typedef enum {
|
typedef enum {
|
||||||
DISPATCH_RESULT_UNKNOWN = 0,
|
DISPATCH_RESULT_UNKNOWN = 0,
|
||||||
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
|
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
|
||||||
index f2dbe6594..865e68bd9 100644
|
index 43f0373..b99fd41 100644
|
||||||
--- a/src/devices/nm-device.c
|
--- a/src/devices/nm-device.c
|
||||||
+++ b/src/devices/nm-device.c
|
+++ b/src/devices/nm-device.c
|
||||||
@@ -2771,6 +2771,10 @@ concheck_update_state (NMDevice *self, NMConnectivityState state, gboolean allow
|
@@ -2853,6 +2853,10 @@ concheck_update_state (NMDevice *self,
|
||||||
_LOGD (LOGD_CONCHECK, "connectivity state changed from %s to %s",
|
_LOGD (LOGD_CONCHECK, "connectivity state changed from %s to %s",
|
||||||
nm_connectivity_state_to_string (priv->connectivity_state),
|
nm_connectivity_state_to_string (priv->concheck_x[IS_IPv4].state),
|
||||||
nm_connectivity_state_to_string (state));
|
nm_connectivity_state_to_string (state));
|
||||||
+
|
+
|
||||||
+ if (priv->connectivity_state == NM_CONNECTIVITY_FULL)
|
+ if (priv->concheck_x[IS_IPv4].state == NM_CONNECTIVITY_FULL)
|
||||||
+ nm_dispatcher_call_device_connectivity(state, self, NULL, NULL, NULL);
|
+ nm_dispatcher_call_device_connectivity(state, self, NULL, NULL, NULL);
|
||||||
+
|
+
|
||||||
priv->connectivity_state = state;
|
priv->concheck_x[IS_IPv4].state = state;
|
||||||
|
|
||||||
_notify (self, PROP_CONNECTIVITY);
|
_notify (self, IS_IPv4 ? PROP_IP4_CONNECTIVITY : PROP_IP6_CONNECTIVITY);
|
||||||
diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c
|
diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c
|
||||||
index 368b781ad..a49b3ea61 100644
|
index d656edc..39b781c 100644
|
||||||
--- a/src/nm-dispatcher.c
|
--- a/src/nm-dispatcher.c
|
||||||
+++ b/src/nm-dispatcher.c
|
+++ b/src/nm-dispatcher.c
|
||||||
@@ -467,7 +467,8 @@ static const char *action_table[] = {
|
@@ -464,7 +464,8 @@ static const char *action_table[] = {
|
||||||
[NM_DISPATCHER_ACTION_VPN_DOWN] = NMD_ACTION_VPN_DOWN,
|
[NM_DISPATCHER_ACTION_VPN_DOWN] = NMD_ACTION_VPN_DOWN,
|
||||||
[NM_DISPATCHER_ACTION_DHCP4_CHANGE] = NMD_ACTION_DHCP4_CHANGE,
|
[NM_DISPATCHER_ACTION_DHCP4_CHANGE] = NMD_ACTION_DHCP4_CHANGE,
|
||||||
[NM_DISPATCHER_ACTION_DHCP6_CHANGE] = NMD_ACTION_DHCP6_CHANGE,
|
[NM_DISPATCHER_ACTION_DHCP6_CHANGE] = NMD_ACTION_DHCP6_CHANGE,
|
||||||
|
|
@ -58,7 +58,7 @@ index 368b781ad..a49b3ea61 100644
|
||||||
};
|
};
|
||||||
|
|
||||||
static const char *
|
static const char *
|
||||||
@@ -915,6 +916,43 @@ nm_dispatcher_call_connectivity (NMConnectivityState connectivity_state,
|
@@ -912,6 +913,43 @@ nm_dispatcher_call_connectivity (NMConnectivityState connectivity_state,
|
||||||
callback, user_data, out_call_id);
|
callback, user_data, out_call_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -103,7 +103,7 @@ index 368b781ad..a49b3ea61 100644
|
||||||
nm_dispatcher_call_cancel (guint call_id)
|
nm_dispatcher_call_cancel (guint call_id)
|
||||||
{
|
{
|
||||||
diff --git a/src/nm-dispatcher.h b/src/nm-dispatcher.h
|
diff --git a/src/nm-dispatcher.h b/src/nm-dispatcher.h
|
||||||
index 1cdeeb882..9902a77ba 100644
|
index 1cdeeb8..9902a77 100644
|
||||||
--- a/src/nm-dispatcher.h
|
--- a/src/nm-dispatcher.h
|
||||||
+++ b/src/nm-dispatcher.h
|
+++ b/src/nm-dispatcher.h
|
||||||
@@ -36,7 +36,8 @@ typedef enum {
|
@@ -36,7 +36,8 @@ typedef enum {
|
||||||
|
|
|
||||||
|
|
@ -12,14 +12,14 @@ Signed-off-by: Javier Viguera <javier.viguera@digi.com>
|
||||||
src/nm-config-data.h | 2 ++
|
src/nm-config-data.h | 2 ++
|
||||||
src/nm-config.c | 6 ++++++
|
src/nm-config.c | 6 ++++++
|
||||||
src/nm-config.h | 1 +
|
src/nm-config.h | 1 +
|
||||||
src/nm-connectivity.c | 11 ++++++++++-
|
src/nm-connectivity.c | 12 +++++++++++-
|
||||||
5 files changed, 44 insertions(+), 1 deletion(-)
|
5 files changed, 45 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/src/nm-config-data.c b/src/nm-config-data.c
|
diff --git a/src/nm-config-data.c b/src/nm-config-data.c
|
||||||
index 8d84e74abc5a..1493f69a2664 100644
|
index 608b7e5..393f723 100644
|
||||||
--- a/src/nm-config-data.c
|
--- a/src/nm-config-data.c
|
||||||
+++ b/src/nm-config-data.c
|
+++ b/src/nm-config-data.c
|
||||||
@@ -68,6 +68,7 @@ NM_GOBJECT_PROPERTIES_DEFINE_BASE (
|
@@ -66,6 +66,7 @@ NM_GOBJECT_PROPERTIES_DEFINE_BASE (
|
||||||
PROP_CONNECTIVITY_ENABLED,
|
PROP_CONNECTIVITY_ENABLED,
|
||||||
PROP_CONNECTIVITY_URI,
|
PROP_CONNECTIVITY_URI,
|
||||||
PROP_CONNECTIVITY_INTERVAL,
|
PROP_CONNECTIVITY_INTERVAL,
|
||||||
|
|
@ -27,7 +27,7 @@ index 8d84e74abc5a..1493f69a2664 100644
|
||||||
PROP_CONNECTIVITY_RESPONSE,
|
PROP_CONNECTIVITY_RESPONSE,
|
||||||
PROP_NO_AUTO_DEFAULT,
|
PROP_NO_AUTO_DEFAULT,
|
||||||
);
|
);
|
||||||
@@ -93,6 +94,7 @@ typedef struct {
|
@@ -91,6 +92,7 @@ typedef struct {
|
||||||
char *uri;
|
char *uri;
|
||||||
char *response;
|
char *response;
|
||||||
guint interval;
|
guint interval;
|
||||||
|
|
@ -35,7 +35,7 @@ index 8d84e74abc5a..1493f69a2664 100644
|
||||||
} connectivity;
|
} connectivity;
|
||||||
|
|
||||||
int autoconnect_retries_default;
|
int autoconnect_retries_default;
|
||||||
@@ -269,6 +271,14 @@ nm_config_data_get_connectivity_interval (const NMConfigData *self)
|
@@ -268,6 +270,14 @@ nm_config_data_get_connectivity_interval (const NMConfigData *self)
|
||||||
return NM_CONFIG_DATA_GET_PRIVATE (self)->connectivity.interval;
|
return NM_CONFIG_DATA_GET_PRIVATE (self)->connectivity.interval;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -50,7 +50,7 @@ index 8d84e74abc5a..1493f69a2664 100644
|
||||||
const char *
|
const char *
|
||||||
nm_config_data_get_connectivity_response (const NMConfigData *self)
|
nm_config_data_get_connectivity_response (const NMConfigData *self)
|
||||||
{
|
{
|
||||||
@@ -1499,6 +1509,7 @@ nm_config_data_diff (NMConfigData *old_data, NMConfigData *new_data)
|
@@ -1538,6 +1548,7 @@ nm_config_data_diff (NMConfigData *old_data, NMConfigData *new_data)
|
||||||
|
|
||||||
if ( nm_config_data_get_connectivity_enabled (old_data) != nm_config_data_get_connectivity_enabled (new_data)
|
if ( nm_config_data_get_connectivity_enabled (old_data) != nm_config_data_get_connectivity_enabled (new_data)
|
||||||
|| nm_config_data_get_connectivity_interval (old_data) != nm_config_data_get_connectivity_interval (new_data)
|
|| nm_config_data_get_connectivity_interval (old_data) != nm_config_data_get_connectivity_interval (new_data)
|
||||||
|
|
@ -58,7 +58,7 @@ index 8d84e74abc5a..1493f69a2664 100644
|
||||||
|| g_strcmp0 (nm_config_data_get_connectivity_uri (old_data), nm_config_data_get_connectivity_uri (new_data))
|
|| g_strcmp0 (nm_config_data_get_connectivity_uri (old_data), nm_config_data_get_connectivity_uri (new_data))
|
||||||
|| g_strcmp0 (nm_config_data_get_connectivity_response (old_data), nm_config_data_get_connectivity_response (new_data)))
|
|| g_strcmp0 (nm_config_data_get_connectivity_response (old_data), nm_config_data_get_connectivity_response (new_data)))
|
||||||
changes |= NM_CONFIG_CHANGE_CONNECTIVITY;
|
changes |= NM_CONFIG_CHANGE_CONNECTIVITY;
|
||||||
@@ -1547,6 +1558,9 @@ get_property (GObject *object,
|
@@ -1586,6 +1597,9 @@ get_property (GObject *object,
|
||||||
case PROP_CONNECTIVITY_INTERVAL:
|
case PROP_CONNECTIVITY_INTERVAL:
|
||||||
g_value_set_uint (value, nm_config_data_get_connectivity_interval (self));
|
g_value_set_uint (value, nm_config_data_get_connectivity_interval (self));
|
||||||
break;
|
break;
|
||||||
|
|
@ -68,7 +68,7 @@ index 8d84e74abc5a..1493f69a2664 100644
|
||||||
case PROP_CONNECTIVITY_RESPONSE:
|
case PROP_CONNECTIVITY_RESPONSE:
|
||||||
g_value_set_string (value, nm_config_data_get_connectivity_response (self));
|
g_value_set_string (value, nm_config_data_get_connectivity_response (self));
|
||||||
break;
|
break;
|
||||||
@@ -1652,6 +1666,11 @@ constructed (GObject *object)
|
@@ -1705,6 +1719,11 @@ constructed (GObject *object)
|
||||||
priv->connectivity.interval = _nm_utils_ascii_str_to_int64 (str, 10, 0, G_MAXUINT, NM_CONFIG_DEFAULT_CONNECTIVITY_INTERVAL);
|
priv->connectivity.interval = _nm_utils_ascii_str_to_int64 (str, 10, 0, G_MAXUINT, NM_CONFIG_DEFAULT_CONNECTIVITY_INTERVAL);
|
||||||
g_free (str);
|
g_free (str);
|
||||||
|
|
||||||
|
|
@ -77,10 +77,10 @@ index 8d84e74abc5a..1493f69a2664 100644
|
||||||
+ priv->connectivity.timeout = _nm_utils_ascii_str_to_int64 (str, 10, 1, G_MAXUINT, NM_CONFIG_DEFAULT_CONNECTIVITY_TIMEOUT);
|
+ priv->connectivity.timeout = _nm_utils_ascii_str_to_int64 (str, 10, 1, G_MAXUINT, NM_CONFIG_DEFAULT_CONNECTIVITY_TIMEOUT);
|
||||||
+ g_free (str);
|
+ g_free (str);
|
||||||
+
|
+
|
||||||
priv->dns_mode = nm_strstrip (g_key_file_get_string (priv->keyfile, NM_CONFIG_KEYFILE_GROUP_MAIN, "dns", NULL));
|
priv->dns_mode = nm_strstrip (g_key_file_get_string (priv->keyfile,
|
||||||
priv->rc_manager = nm_strstrip (g_key_file_get_string (priv->keyfile, NM_CONFIG_KEYFILE_GROUP_MAIN, "rc-manager", NULL));
|
NM_CONFIG_KEYFILE_GROUP_MAIN,
|
||||||
|
NM_CONFIG_KEYFILE_KEY_MAIN_DNS,
|
||||||
@@ -1803,6 +1822,12 @@ nm_config_data_class_init (NMConfigDataClass *config_class)
|
@@ -1873,6 +1892,12 @@ nm_config_data_class_init (NMConfigDataClass *config_class)
|
||||||
G_PARAM_READABLE |
|
G_PARAM_READABLE |
|
||||||
G_PARAM_STATIC_STRINGS);
|
G_PARAM_STATIC_STRINGS);
|
||||||
|
|
||||||
|
|
@ -94,7 +94,7 @@ index 8d84e74abc5a..1493f69a2664 100644
|
||||||
g_param_spec_string (NM_CONFIG_DATA_CONNECTIVITY_RESPONSE, "", "",
|
g_param_spec_string (NM_CONFIG_DATA_CONNECTIVITY_RESPONSE, "", "",
|
||||||
NULL,
|
NULL,
|
||||||
diff --git a/src/nm-config-data.h b/src/nm-config-data.h
|
diff --git a/src/nm-config-data.h b/src/nm-config-data.h
|
||||||
index b52ddcc4f85f..a0b35ac972af 100644
|
index c043aa3..78b2818 100644
|
||||||
--- a/src/nm-config-data.h
|
--- a/src/nm-config-data.h
|
||||||
+++ b/src/nm-config-data.h
|
+++ b/src/nm-config-data.h
|
||||||
@@ -35,6 +35,7 @@
|
@@ -35,6 +35,7 @@
|
||||||
|
|
@ -114,10 +114,10 @@ index b52ddcc4f85f..a0b35ac972af 100644
|
||||||
|
|
||||||
int nm_config_data_get_autoconnect_retries_default (const NMConfigData *config_data);
|
int nm_config_data_get_autoconnect_retries_default (const NMConfigData *config_data);
|
||||||
diff --git a/src/nm-config.c b/src/nm-config.c
|
diff --git a/src/nm-config.c b/src/nm-config.c
|
||||||
index 628eca4f13f0..87c7791a49c5 100644
|
index 3e82bde..1c7dbd7 100644
|
||||||
--- a/src/nm-config.c
|
--- a/src/nm-config.c
|
||||||
+++ b/src/nm-config.c
|
+++ b/src/nm-config.c
|
||||||
@@ -60,6 +60,7 @@ struct NMConfigCmdLineOptions {
|
@@ -59,6 +59,7 @@ struct NMConfigCmdLineOptions {
|
||||||
* set or not via GOptionEntry
|
* set or not via GOptionEntry
|
||||||
*/
|
*/
|
||||||
int connectivity_interval;
|
int connectivity_interval;
|
||||||
|
|
@ -125,7 +125,7 @@ index 628eca4f13f0..87c7791a49c5 100644
|
||||||
char *connectivity_response;
|
char *connectivity_response;
|
||||||
|
|
||||||
/* @first_start is not provided by command line. It is a convenient hack
|
/* @first_start is not provided by command line. It is a convenient hack
|
||||||
@@ -470,6 +471,7 @@ _nm_config_cmd_line_options_clear (NMConfigCmdLineOptions *cli)
|
@@ -483,6 +484,7 @@ _nm_config_cmd_line_options_clear (NMConfigCmdLineOptions *cli)
|
||||||
g_clear_pointer (&cli->connectivity_uri, g_free);
|
g_clear_pointer (&cli->connectivity_uri, g_free);
|
||||||
g_clear_pointer (&cli->connectivity_response, g_free);
|
g_clear_pointer (&cli->connectivity_response, g_free);
|
||||||
cli->connectivity_interval = -1;
|
cli->connectivity_interval = -1;
|
||||||
|
|
@ -133,7 +133,7 @@ index 628eca4f13f0..87c7791a49c5 100644
|
||||||
cli->first_start = FALSE;
|
cli->first_start = FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -493,6 +495,7 @@ _nm_config_cmd_line_options_copy (const NMConfigCmdLineOptions *cli, NMConfigCmd
|
@@ -506,6 +508,7 @@ _nm_config_cmd_line_options_copy (const NMConfigCmdLineOptions *cli, NMConfigCmd
|
||||||
dst->connectivity_uri = g_strdup (cli->connectivity_uri);
|
dst->connectivity_uri = g_strdup (cli->connectivity_uri);
|
||||||
dst->connectivity_response = g_strdup (cli->connectivity_response);
|
dst->connectivity_response = g_strdup (cli->connectivity_response);
|
||||||
dst->connectivity_interval = cli->connectivity_interval;
|
dst->connectivity_interval = cli->connectivity_interval;
|
||||||
|
|
@ -141,7 +141,7 @@ index 628eca4f13f0..87c7791a49c5 100644
|
||||||
dst->first_start = cli->first_start;
|
dst->first_start = cli->first_start;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -572,6 +575,7 @@ nm_config_cmd_line_options_add_to_entries (NMConfigCmdLineOptions *cli,
|
@@ -585,6 +588,7 @@ nm_config_cmd_line_options_add_to_entries (NMConfigCmdLineOptions *cli,
|
||||||
/* These three are hidden for now, and should eventually just go away. */
|
/* These three are hidden for now, and should eventually just go away. */
|
||||||
{ "connectivity-uri", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &cli->connectivity_uri, N_("An http(s) address for checking internet connectivity"), "http://example.com" },
|
{ "connectivity-uri", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &cli->connectivity_uri, N_("An http(s) address for checking internet connectivity"), "http://example.com" },
|
||||||
{ "connectivity-interval", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_INT, &cli->connectivity_interval, N_("The interval between connectivity checks (in seconds)"), G_STRINGIFY (NM_CONFIG_DEFAULT_CONNECTIVITY_INTERVAL) },
|
{ "connectivity-interval", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_INT, &cli->connectivity_interval, N_("The interval between connectivity checks (in seconds)"), G_STRINGIFY (NM_CONFIG_DEFAULT_CONNECTIVITY_INTERVAL) },
|
||||||
|
|
@ -149,7 +149,7 @@ index 628eca4f13f0..87c7791a49c5 100644
|
||||||
{ "connectivity-response", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &cli->connectivity_response, N_("The expected start of the response"), NM_CONFIG_DEFAULT_CONNECTIVITY_RESPONSE },
|
{ "connectivity-response", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &cli->connectivity_response, N_("The expected start of the response"), NM_CONFIG_DEFAULT_CONNECTIVITY_RESPONSE },
|
||||||
{ 0 },
|
{ 0 },
|
||||||
};
|
};
|
||||||
@@ -1119,6 +1123,8 @@ read_entire_config (const NMConfigCmdLineOptions *cli,
|
@@ -1301,6 +1305,8 @@ read_entire_config (const NMConfigCmdLineOptions *cli,
|
||||||
g_key_file_set_string (keyfile, NM_CONFIG_KEYFILE_GROUP_CONNECTIVITY, "uri", cli->connectivity_uri);
|
g_key_file_set_string (keyfile, NM_CONFIG_KEYFILE_GROUP_CONNECTIVITY, "uri", cli->connectivity_uri);
|
||||||
if (cli->connectivity_interval >= 0)
|
if (cli->connectivity_interval >= 0)
|
||||||
g_key_file_set_integer (keyfile, NM_CONFIG_KEYFILE_GROUP_CONNECTIVITY, "interval", cli->connectivity_interval);
|
g_key_file_set_integer (keyfile, NM_CONFIG_KEYFILE_GROUP_CONNECTIVITY, "interval", cli->connectivity_interval);
|
||||||
|
|
@ -159,7 +159,7 @@ index 628eca4f13f0..87c7791a49c5 100644
|
||||||
g_key_file_set_string (keyfile, NM_CONFIG_KEYFILE_GROUP_CONNECTIVITY, "response", cli->connectivity_response);
|
g_key_file_set_string (keyfile, NM_CONFIG_KEYFILE_GROUP_CONNECTIVITY, "response", cli->connectivity_response);
|
||||||
}
|
}
|
||||||
diff --git a/src/nm-config.h b/src/nm-config.h
|
diff --git a/src/nm-config.h b/src/nm-config.h
|
||||||
index c65572ce3fe5..654567779282 100644
|
index 66f1b69..debdce7 100644
|
||||||
--- a/src/nm-config.h
|
--- a/src/nm-config.h
|
||||||
+++ b/src/nm-config.h
|
+++ b/src/nm-config.h
|
||||||
@@ -39,6 +39,7 @@
|
@@ -39,6 +39,7 @@
|
||||||
|
|
@ -171,35 +171,43 @@ index c65572ce3fe5..654567779282 100644
|
||||||
|
|
||||||
#define NM_CONFIG_KEYFILE_LIST_SEPARATOR ','
|
#define NM_CONFIG_KEYFILE_LIST_SEPARATOR ','
|
||||||
diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c
|
diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c
|
||||||
index 8a6e955ae56f..6a491eb22e96 100644
|
index aee6c57..274a909 100644
|
||||||
--- a/src/nm-connectivity.c
|
--- a/src/nm-connectivity.c
|
||||||
+++ b/src/nm-connectivity.c
|
+++ b/src/nm-connectivity.c
|
||||||
@@ -101,6 +101,7 @@ typedef struct {
|
@@ -121,6 +121,7 @@ typedef struct {
|
||||||
char *response;
|
CList completed_handles_lst_head;
|
||||||
gboolean enabled;
|
|
||||||
guint interval;
|
|
||||||
+ guint timeout;
|
|
||||||
NMConfig *config;
|
NMConfig *config;
|
||||||
#if WITH_CONCHECK
|
ConConfig *con_config;
|
||||||
struct {
|
+ guint timeout;
|
||||||
@@ -601,7 +602,7 @@ nm_connectivity_check_start (NMConnectivity *self,
|
guint interval;
|
||||||
curl_easy_setopt (ehandle, CURLOPT_INTERFACE, cb_data->ifspec);
|
|
||||||
curl_multi_add_handle (priv->concheck.curl_mhandle, ehandle);
|
|
||||||
|
|
||||||
- cb_data->timeout_id = g_timeout_add_seconds (20, _timeout_cb, cb_data);
|
bool enabled:1;
|
||||||
+ cb_data->timeout_id = g_timeout_add_seconds (priv->timeout, _timeout_cb, cb_data);
|
@@ -668,6 +669,7 @@ _idle_cb (gpointer user_data)
|
||||||
|
static void
|
||||||
|
do_curl_request (NMConnectivityCheckHandle *cb_data)
|
||||||
|
{
|
||||||
|
+ NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (cb_data->self);
|
||||||
|
CURLM *mhandle;
|
||||||
|
CURL *ehandle;
|
||||||
|
long resolve;
|
||||||
|
@@ -688,7 +690,7 @@ do_curl_request (NMConnectivityCheckHandle *cb_data)
|
||||||
|
cb_data->concheck.curl_mhandle = mhandle;
|
||||||
|
cb_data->concheck.curl_ehandle = ehandle;
|
||||||
|
cb_data->concheck.request_headers = curl_slist_append (NULL, "Connection: close");
|
||||||
|
- cb_data->timeout_id = g_timeout_add_seconds (20, _timeout_cb, cb_data);
|
||||||
|
+ cb_data->timeout_id = g_timeout_add_seconds (priv->timeout, _timeout_cb, cb_data);
|
||||||
|
|
||||||
_LOG2D ("start request to '%s'", priv->uri);
|
curl_multi_setopt (mhandle, CURLMOPT_SOCKETFUNCTION, multi_socket_cb);
|
||||||
return cb_data;
|
curl_multi_setopt (mhandle, CURLMOPT_SOCKETDATA, cb_data);
|
||||||
@@ -652,6 +653,7 @@ update_config (NMConnectivity *self, NMConfigData *config_data)
|
@@ -1079,6 +1081,7 @@ update_config (NMConnectivity *self, NMConfigData *config_data)
|
||||||
|
{
|
||||||
NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (self);
|
NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (self);
|
||||||
const char *uri, *response;
|
|
||||||
guint interval;
|
guint interval;
|
||||||
+ guint timeout;
|
+ guint timeout;
|
||||||
gboolean enabled;
|
gboolean enabled;
|
||||||
gboolean changed = FALSE;
|
gboolean changed = FALSE;
|
||||||
|
const char *cur_uri = priv->con_config ? priv->con_config->uri : NULL;
|
||||||
@@ -704,6 +706,13 @@ update_config (NMConnectivity *self, NMConfigData *config_data)
|
@@ -1165,6 +1168,13 @@ update_config (NMConnectivity *self, NMConfigData *config_data)
|
||||||
changed = TRUE;
|
changed = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -210,6 +218,6 @@ index 8a6e955ae56f..6a491eb22e96 100644
|
||||||
+ changed = TRUE;
|
+ changed = TRUE;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
/* Set the response. */
|
if (changed)
|
||||||
response = nm_config_data_get_connectivity_response (config_data);
|
g_signal_emit (self, signals[CONFIG_CHANGED], 0);
|
||||||
if (!nm_streq0 (response, priv->response)) {
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue