Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hardknott: networkmanager: adapt patches to v1.30.4 

Aside from the file paths changing, there are a few cosmetic differences
between v1.22.14 and v1.30.4 that prevented the patches from applying, so
re-work them.

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar 2021-12-22 14:32:53 +01:00
parent 52c37a6fe5
commit 45302d67c1
2 changed files with 257 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/0001-networkmanager-trigger-dispatcher-on-per-device-conn.patch
View File

@ -1,7 +1,7 @@
From: Arturo Buzarra <arturo.buzarra@digi.com> From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Mon, 21 Jan 2019 11:30:57 +0100 Date: Mon, 21 Jan 2019 11:30:57 +0100
Subject: [PATCH] networkmanager: trigger dispatcher on per-device connectivity Subject: [PATCH] networkmanager: trigger dispatcher on per-device
loss connectivity loss
This creates a new dispatcher action DEVICE_CONNECTIVITY_CHANGE, that This creates a new dispatcher action DEVICE_CONNECTIVITY_CHANGE, that
gets triggered whenever one interface fails in the upstream connectivity gets triggered whenever one interface fails in the upstream connectivity
@ -10,56 +10,58 @@ 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>
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
--- ---
shared/nm-libnm-core-aux/nm-dispatcher-api.h | 1 + .../nm-libnm-core-aux/nm-dispatcher-api.h | 1 +
src/devices/nm-device.c | 4 ++ src/core/devices/nm-device.c | 4 ++
src/nm-dispatcher.c | 41 +++++++++++++++++++- src/core/nm-dispatcher.c | 42 ++++++++++++++++++-
src/nm-dispatcher.h | 10 ++++- src/core/nm-dispatcher.h | 10 ++++-
4 files changed, 54 insertions(+), 2 deletions(-) 4 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/shared/nm-libnm-core-aux/nm-dispatcher-api.h b/shared/nm-libnm-core-aux/nm-dispatcher-api.h diff --git a/libnm-core/nm-libnm-core-aux/nm-dispatcher-api.h b/libnm-core/nm-libnm-core-aux/nm-dispatcher-api.h
index 96f512e0e..ecc9be3f7 100644 index 7776c84f9a..265fc29ee0 100644
--- a/shared/nm-libnm-core-aux/nm-dispatcher-api.h --- a/libnm-core/nm-libnm-core-aux/nm-dispatcher-api.h
+++ b/shared/nm-libnm-core-aux/nm-dispatcher-api.h +++ b/libnm-core/nm-libnm-core-aux/nm-dispatcher-api.h
@@ -33,6 +33,7 @@ @@ -33,6 +33,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"
+#define NMD_ACTION_DEVICE_CONNECTIVITY_CHANGE "device-connectivity-change" +#define NMD_ACTION_DEVICE_CONNECTIVITY_CHANGE "device-connectivity-change"
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/core/devices/nm-device.c b/src/core/devices/nm-device.c
index 1a57f5c7a..f17390169 100644 index 5eaf8c23e7..d1444eb36f 100644
--- a/src/devices/nm-device.c --- a/src/core/devices/nm-device.c
+++ b/src/devices/nm-device.c +++ b/src/core/devices/nm-device.c
@@ -2934,6 +2934,10 @@ concheck_update_state (NMDevice *self, @@ -4325,6 +4325,10 @@ concheck_update_state(NMDevice * self,
_LOGD (LOGD_CONCHECK, "connectivity state changed from %s to %s", "connectivity state changed from %s to %s",
nm_connectivity_state_to_string (priv->concheck_x[IS_IPv4].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->concheck_x[IS_IPv4].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->concheck_x[IS_IPv4].state = state; priv->concheck_x[IS_IPv4].state = state;
_notify (self, IS_IPv4 ? PROP_IP4_CONNECTIVITY : PROP_IP6_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/core/nm-dispatcher.c b/src/core/nm-dispatcher.c
index 54b0567bc..2d523c3b2 100644 index 0ab409f5ed..3121662920 100644
--- a/src/nm-dispatcher.c --- a/src/core/nm-dispatcher.c
+++ b/src/nm-dispatcher.c +++ b/src/core/nm-dispatcher.c
@@ -483,7 +483,8 @@ static const char *action_table[] = { @@ -466,7 +466,9 @@ static const char *action_table[] = {[NM_DISPATCHER_ACTION_HOSTNAME] = NMD_A
[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, [NM_DISPATCHER_ACTION_CONNECTIVITY_CHANGE] =
- [NM_DISPATCHER_ACTION_CONNECTIVITY_CHANGE] = NMD_ACTION_CONNECTIVITY_CHANGE - NMD_ACTION_CONNECTIVITY_CHANGE};
+ [NM_DISPATCHER_ACTION_CONNECTIVITY_CHANGE] = NMD_ACTION_CONNECTIVITY_CHANGE, + NMD_ACTION_CONNECTIVITY_CHANGE,
+ [NM_DISPATCHER_ACTION_DEVICE_CONNECTIVITY_CHANGE] = NMD_ACTION_DEVICE_CONNECTIVITY_CHANGE + [NM_DISPATCHER_ACTION_DEVICE_CONNECTIVITY_CHANGE] =
}; + NMD_ACTION_DEVICE_CONNECTIVITY_CHANGE};
static const char * static const char *
@@ -896,6 +897,44 @@ nm_dispatcher_call_connectivity (NMConnectivityState connectivity_state, action_to_string(NMDispatcherAction action)
callback, user_data, out_call_id); @@ -926,6 +928,44 @@ nm_dispatcher_call_connectivity(NMConnectivityState connectivity_state,
out_call_id);
} }
+/** +/**
@ -101,25 +103,25 @@ index 54b0567bc..2d523c3b2 100644
+} +}
+ +
void void
nm_dispatcher_call_cancel (NMDispatcherCallId *call_id) nm_dispatcher_call_cancel(NMDispatcherCallId *call_id)
{ {
diff --git a/src/nm-dispatcher.h b/src/nm-dispatcher.h diff --git a/src/core/nm-dispatcher.h b/src/core/nm-dispatcher.h
index 93272dc4c..c43d5bb0d 100644 index d588de4e8f..ff966be4df 100644
--- a/src/nm-dispatcher.h --- a/src/core/nm-dispatcher.h
+++ b/src/nm-dispatcher.h +++ b/src/core/nm-dispatcher.h
@@ -21,7 +21,8 @@ typedef enum { @@ -21,7 +21,8 @@ typedef enum {
NM_DISPATCHER_ACTION_VPN_DOWN, NM_DISPATCHER_ACTION_VPN_DOWN,
NM_DISPATCHER_ACTION_DHCP4_CHANGE, NM_DISPATCHER_ACTION_DHCP4_CHANGE,
NM_DISPATCHER_ACTION_DHCP6_CHANGE, NM_DISPATCHER_ACTION_DHCP6_CHANGE,
- NM_DISPATCHER_ACTION_CONNECTIVITY_CHANGE - NM_DISPATCHER_ACTION_CONNECTIVITY_CHANGE
+ NM_DISPATCHER_ACTION_CONNECTIVITY_CHANGE, + NM_DISPATCHER_ACTION_CONNECTIVITY_CHANGE,
+ NM_DISPATCHER_ACTION_DEVICE_CONNECTIVITY_CHANGE + NM_DISPATCHER_ACTION_DEVICE_CONNECTIVITY_CHANGE
} NMDispatcherAction; } NMDispatcherAction;
typedef struct NMDispatcherCallId NMDispatcherCallId; typedef struct NMDispatcherCallId NMDispatcherCallId;
@@ -69,6 +70,13 @@ gboolean nm_dispatcher_call_connectivity (NMConnectivityState state, @@ -69,6 +70,13 @@ gboolean nm_dispatcher_call_connectivity(NMConnectivityState state,
gpointer user_data, gpointer user_data,
NMDispatcherCallId **out_call_id); NMDispatcherCallId **out_call_id);
+gboolean nm_dispatcher_call_device_connectivity(NMConnectivityState +gboolean nm_dispatcher_call_device_connectivity(NMConnectivityState
+ connectivity_state, + connectivity_state,
@ -128,6 +130,6 @@ index 93272dc4c..c43d5bb0d 100644
+ gpointer user_data, + gpointer user_data,
+ NMDispatcherCallId **out_call_id); + NMDispatcherCallId **out_call_id);
+ +
void nm_dispatcher_call_cancel (NMDispatcherCallId *call_id); void nm_dispatcher_call_cancel(NMDispatcherCallId *call_id);
#endif /* __NM_DISPATCHER_H__ */ #endif /* __NM_DISPATCHER_H__ */

364
meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/0002-connectivity-add-config-option-for-response-timeout.patch
View File

@ -7,97 +7,110 @@ configure the response timeout in the connectivity section of the main
NetworkManager config file. NetworkManager config file.
Signed-off-by: Javier Viguera <javier.viguera@digi.com> Signed-off-by: Javier Viguera <javier.viguera@digi.com>
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
--- ---
src/nm-config-data.c | 25 +++++++++++++++++++++++++ src/core/nm-config-data.c | 37 +++++++++++++++++++++++++++++++++++++
src/nm-config-data.h | 2 ++ src/core/nm-config-data.h | 2 ++
src/nm-config.c | 6 ++++++ src/core/nm-config.c | 15 +++++++++++++++
src/nm-config.h | 1 + src/core/nm-config.h | 1 +
src/nm-connectivity.c | 12 +++++++++++- src/core/nm-connectivity.c | 12 +++++++++++-
5 files changed, 45 insertions(+), 1 deletion(-) 5 files changed, 66 insertions(+), 1 deletion(-)
diff --git a/src/nm-config-data.c b/src/nm-config-data.c diff --git a/src/core/nm-config-data.c b/src/core/nm-config-data.c
index 608b7e5..393f723 100644 index c62c677372..64524403dd 100644
--- a/src/nm-config-data.c --- a/src/core/nm-config-data.c
+++ b/src/nm-config-data.c +++ b/src/core/nm-config-data.c
@@ -66,6 +66,7 @@ NM_GOBJECT_PROPERTIES_DEFINE_BASE ( @@ -51,6 +51,7 @@ NM_GOBJECT_PROPERTIES_DEFINE_BASE(PROP_CONFIG_MAIN_FILE,
PROP_CONNECTIVITY_ENABLED, PROP_CONNECTIVITY_ENABLED,
PROP_CONNECTIVITY_URI, PROP_CONNECTIVITY_URI,
PROP_CONNECTIVITY_INTERVAL, PROP_CONNECTIVITY_INTERVAL,
+ PROP_CONNECTIVITY_TIMEOUT, + PROP_CONNECTIVITY_TIMEOUT,
PROP_CONNECTIVITY_RESPONSE, PROP_CONNECTIVITY_RESPONSE,
PROP_NO_AUTO_DEFAULT, PROP_NO_AUTO_DEFAULT, );
);
@@ -91,6 +92,7 @@ typedef struct {
char *uri;
char *response;
guint interval;
+ guint timeout;
} connectivity;
int autoconnect_retries_default; @@ -75,6 +76,7 @@ typedef struct {
@@ -268,6 +270,14 @@ nm_config_data_get_connectivity_interval (const NMConfigData *self) char * uri;
return NM_CONFIG_DATA_GET_PRIVATE (self)->connectivity.interval; char * response;
guint interval;
+ guint timeout;
} connectivity;
int autoconnect_retries_default;
@@ -280,6 +282,14 @@ nm_config_data_get_connectivity_interval(const NMConfigData *self)
return NM_CONFIG_DATA_GET_PRIVATE(self)->connectivity.interval;
} }
+guint +guint
+nm_config_data_get_connectivity_timeout (const NMConfigData *self) +nm_config_data_get_connectivity_timeout(const NMConfigData *self)
+{ +{
+ g_return_val_if_fail (self, 0); + g_return_val_if_fail(self, 0);
+ +
+ return NM_CONFIG_DATA_GET_PRIVATE (self)->connectivity.timeout; + return NM_CONFIG_DATA_GET_PRIVATE(self)->connectivity.timeout;
+} +}
+ +
const char * const char *
nm_config_data_get_connectivity_response (const NMConfigData *self) nm_config_data_get_connectivity_response(const NMConfigData *self)
{ {
@@ -1538,6 +1548,7 @@ nm_config_data_diff (NMConfigData *old_data, NMConfigData *new_data) @@ -1662,6 +1672,8 @@ nm_config_data_diff(NMConfigData *old_data, NMConfigData *new_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_timeout(old_data)
+ != nm_config_data_get_connectivity_timeout(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),
@@ -1734,6 +1746,9 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
case PROP_CONNECTIVITY_INTERVAL:
g_value_set_uint(value, nm_config_data_get_connectivity_interval(self));
break;
+ case PROP_CONNECTIVITY_TIMEOUT:
+ g_value_set_uint(value, nm_config_data_get_connectivity_timeout(self));
+ break;
case PROP_CONNECTIVITY_RESPONSE:
g_value_set_string(value, nm_config_data_get_connectivity_response(self));
break;
@@ -1878,6 +1893,19 @@ constructed(GObject *object)
NM_CONFIG_DEFAULT_CONNECTIVITY_INTERVAL);
g_free(str);
if ( nm_config_data_get_connectivity_enabled (old_data) != nm_config_data_get_connectivity_enabled (new_data) + /* On missing config value, fallback to the default value */
|| nm_config_data_get_connectivity_interval (old_data) != nm_config_data_get_connectivity_interval (new_data) + str = g_key_file_get_string(priv->keyfile,
+ || nm_config_data_get_connectivity_timeout (old_data) != nm_config_data_get_connectivity_timeout (new_data) + NM_CONFIG_KEYFILE_GROUP_CONNECTIVITY,
|| g_strcmp0 (nm_config_data_get_connectivity_uri (old_data), nm_config_data_get_connectivity_uri (new_data)) + "timeout",
|| g_strcmp0 (nm_config_data_get_connectivity_response (old_data), nm_config_data_get_connectivity_response (new_data))) + NULL);
changes |= NM_CONFIG_CHANGE_CONNECTIVITY; + priv->connectivity.timeout =
@@ -1586,6 +1597,9 @@ get_property (GObject *object, + _nm_utils_ascii_str_to_int64(str,
case PROP_CONNECTIVITY_INTERVAL: + 10,
g_value_set_uint (value, nm_config_data_get_connectivity_interval (self)); + 1,
break; + G_MAXUINT,
+ case PROP_CONNECTIVITY_TIMEOUT: + NM_CONFIG_DEFAULT_CONNECTIVITY_TIMEOUT);
+ g_value_set_uint (value, nm_config_data_get_connectivity_timeout (self)); + g_free(str);
+ break;
case PROP_CONNECTIVITY_RESPONSE:
g_value_set_string (value, nm_config_data_get_connectivity_response (self));
break;
@@ -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);
g_free (str);
+ /* On missing config value, fallback to the default value */
+ str = g_key_file_get_string (priv->keyfile, NM_CONFIG_KEYFILE_GROUP_CONNECTIVITY, "timeout", NULL);
+ priv->connectivity.timeout = _nm_utils_ascii_str_to_int64 (str, 10, 1, G_MAXUINT, NM_CONFIG_DEFAULT_CONNECTIVITY_TIMEOUT);
+ g_free (str);
+ +
priv->dns_mode = nm_strstrip (g_key_file_get_string (priv->keyfile, priv->dns_mode = nm_strstrip(g_key_file_get_string(priv->keyfile,
NM_CONFIG_KEYFILE_GROUP_MAIN, NM_CONFIG_KEYFILE_GROUP_MAIN,
NM_CONFIG_KEYFILE_KEY_MAIN_DNS, NM_CONFIG_KEYFILE_KEY_MAIN_DNS,
@@ -1873,6 +1892,12 @@ nm_config_data_class_init (NMConfigDataClass *config_class) @@ -2069,6 +2097,15 @@ nm_config_data_class_init(NMConfigDataClass *config_class)
G_PARAM_READABLE | 0,
G_PARAM_STATIC_STRINGS); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+ obj_properties[PROP_CONNECTIVITY_TIMEOUT] = + obj_properties[PROP_CONNECTIVITY_TIMEOUT] =
+ g_param_spec_uint(NM_CONFIG_DATA_CONNECTIVITY_TIMEOUT, "", "", + g_param_spec_uint(NM_CONFIG_DATA_CONNECTIVITY_TIMEOUT,
+ 0, G_MAXUINT, 0, + "",
+ G_PARAM_READABLE | + "",
+ G_PARAM_STATIC_STRINGS); + 0,
+ G_MAXUINT,
+ 0,
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+ +
obj_properties[PROP_CONNECTIVITY_RESPONSE] = obj_properties[PROP_CONNECTIVITY_RESPONSE] =
g_param_spec_string (NM_CONFIG_DATA_CONNECTIVITY_RESPONSE, "", "", g_param_spec_string(NM_CONFIG_DATA_CONNECTIVITY_RESPONSE,
NULL, "",
diff --git a/src/nm-config-data.h b/src/nm-config-data.h diff --git a/src/core/nm-config-data.h b/src/core/nm-config-data.h
index c043aa3..78b2818 100644 index 07cffb436d..2cad35456d 100644
--- a/src/nm-config-data.h --- a/src/core/nm-config-data.h
+++ b/src/nm-config-data.h +++ b/src/core/nm-config-data.h
@@ -35,6 +35,7 @@ @@ -44,6 +44,7 @@ typedef enum {
#define NM_CONFIG_DATA_CONNECTIVITY_ENABLED "connectivity-enabled" #define NM_CONFIG_DATA_CONNECTIVITY_ENABLED "connectivity-enabled"
#define NM_CONFIG_DATA_CONNECTIVITY_URI "connectivity-uri" #define NM_CONFIG_DATA_CONNECTIVITY_URI "connectivity-uri"
#define NM_CONFIG_DATA_CONNECTIVITY_INTERVAL "connectivity-interval" #define NM_CONFIG_DATA_CONNECTIVITY_INTERVAL "connectivity-interval"
@ -105,119 +118,128 @@ index c043aa3..78b2818 100644
#define NM_CONFIG_DATA_CONNECTIVITY_RESPONSE "connectivity-response" #define NM_CONFIG_DATA_CONNECTIVITY_RESPONSE "connectivity-response"
#define NM_CONFIG_DATA_NO_AUTO_DEFAULT "no-auto-default" #define NM_CONFIG_DATA_NO_AUTO_DEFAULT "no-auto-default"
#define NM_CONFIG_DATA_DNS_MODE "dns" #define NM_CONFIG_DATA_DNS_MODE "dns"
@@ -161,6 +162,7 @@ char **nm_config_data_get_plugins (const NMConfigData *config_data, gboolean all @@ -169,6 +170,7 @@ char ** nm_config_data_get_plugins(const NMConfigData *config_data, gboolean
gboolean nm_config_data_get_connectivity_enabled (const NMConfigData *config_data); gboolean nm_config_data_get_connectivity_enabled(const NMConfigData *config_data);
const char *nm_config_data_get_connectivity_uri (const NMConfigData *config_data); const char *nm_config_data_get_connectivity_uri(const NMConfigData *config_data);
guint nm_config_data_get_connectivity_interval (const NMConfigData *config_data); guint nm_config_data_get_connectivity_interval(const NMConfigData *config_data);
+guint nm_config_data_get_connectivity_timeout (const NMConfigData *config_data); +guint nm_config_data_get_connectivity_timeout(const NMConfigData *config_data);
const char *nm_config_data_get_connectivity_response (const NMConfigData *config_data); const char *nm_config_data_get_connectivity_response(const NMConfigData *config_data);
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/core/nm-config.c b/src/core/nm-config.c
index 3e82bde..1c7dbd7 100644 index 55323919af..b9a410c6fc 100644
--- a/src/nm-config.c --- a/src/core/nm-config.c
+++ b/src/nm-config.c +++ b/src/core/nm-config.c
@@ -59,6 +59,7 @@ struct NMConfigCmdLineOptions { @@ -45,6 +45,7 @@ struct NMConfigCmdLineOptions {
* set or not via GOptionEntry * set or not via GOptionEntry
*/ */
int connectivity_interval; int connectivity_interval;
+ int connectivity_timeout; + int connectivity_timeout;
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
@@ -483,6 +484,7 @@ _nm_config_cmd_line_options_clear (NMConfigCmdLineOptions *cli) @@ -485,6 +486,7 @@ _nm_config_cmd_line_options_clear(NMConfigCmdLineOptions *cli)
g_clear_pointer (&cli->connectivity_uri, g_free); nm_clear_g_free(&cli->connectivity_uri);
g_clear_pointer (&cli->connectivity_response, g_free); nm_clear_g_free(&cli->connectivity_response);
cli->connectivity_interval = -1; cli->connectivity_interval = -1;
+ cli->connectivity_timeout = -1; + cli->connectivity_timeout = -1;
cli->first_start = FALSE; cli->first_start = FALSE;
} }
@@ -506,6 +508,7 @@ _nm_config_cmd_line_options_copy (const NMConfigCmdLineOptions *cli, NMConfigCmd @@ -508,6 +510,7 @@ _nm_config_cmd_line_options_copy(const NMConfigCmdLineOptions *cli, NMConfigCmdL
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;
+ dst->connectivity_timeout = cli->connectivity_timeout; + dst->connectivity_timeout = cli->connectivity_timeout;
dst->first_start = cli->first_start; dst->first_start = cli->first_start;
} }
@@ -585,6 +588,7 @@ nm_config_cmd_line_options_add_to_entries (NMConfigCmdLineOptions *cli, @@ -655,6 +658,13 @@ nm_config_cmd_line_options_add_to_entries(NMConfigCmdLineOptions *cli, GOptionCo
/* These three are hidden for now, and should eventually just go away. */ &cli->connectivity_interval,
{ "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" }, N_("The interval between connectivity checks (in seconds)"),
{ "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) }, G_STRINGIFY(NM_CONFIG_DEFAULT_CONNECTIVITY_INTERVAL)},
+ { "connectivity-timeout", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_INT, &cli->connectivity_timeout, N_("The timeout for the connectivity checks (in seconds)"), G_STRINGIFY (NM_CONFIG_DEFAULT_CONNECTIVITY_TIMEOUT) }, + {"connectivity-timeout",
{ "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 }, + G_OPTION_FLAG_HIDDEN,
}; + G_OPTION_ARG_INT,
@@ -1301,6 +1305,8 @@ read_entire_config (const NMConfigCmdLineOptions *cli, + &cli->connectivity_timeout,
g_key_file_set_string (keyfile, NM_CONFIG_KEYFILE_GROUP_CONNECTIVITY, "uri", cli->connectivity_uri); + N_("The timeout for the connectivity checks (in seconds)"),
if (cli->connectivity_interval >= 0) + G_STRINGIFY(NM_CONFIG_DEFAULT_CONNECTIVITY_TIMEOUT)},
g_key_file_set_integer (keyfile, NM_CONFIG_KEYFILE_GROUP_CONNECTIVITY, "interval", cli->connectivity_interval); {"connectivity-response",
+ if (cli->connectivity_timeout >= 0) 0,
+ g_key_file_set_integer (keyfile, NM_CONFIG_KEYFILE_GROUP_CONNECTIVITY, "timeout", cli->connectivity_timeout); G_OPTION_FLAG_HIDDEN,
if (cli->connectivity_response && cli->connectivity_response[0]) @@ -1408,6 +1418,11 @@ read_entire_config(const NMConfigCmdLineOptions *cli,
g_key_file_set_string (keyfile, NM_CONFIG_KEYFILE_GROUP_CONNECTIVITY, "response", cli->connectivity_response); NM_CONFIG_KEYFILE_GROUP_CONNECTIVITY,
} "interval",
diff --git a/src/nm-config.h b/src/nm-config.h cli->connectivity_interval);
index 66f1b69..debdce7 100644 + if (cli->connectivity_timeout >= 0)
--- a/src/nm-config.h + g_key_file_set_integer(keyfile,
+++ b/src/nm-config.h + NM_CONFIG_KEYFILE_GROUP_CONNECTIVITY,
@@ -39,6 +39,7 @@ + "timeout",
#define NM_CONFIG_SIGNAL_CONFIG_CHANGED "config-changed" + cli->connectivity_timeout);
if (cli->connectivity_response && cli->connectivity_response[0])
g_key_file_set_string(keyfile,
NM_CONFIG_KEYFILE_GROUP_CONNECTIVITY,
diff --git a/src/core/nm-config.h b/src/core/nm-config.h
index 6f3f514c2b..b33960ba0f 100644
--- a/src/core/nm-config.h
+++ b/src/core/nm-config.h
@@ -24,6 +24,7 @@
#define NM_CONFIG_SIGNAL_CONFIG_CHANGED "config-changed"
#define NM_CONFIG_DEFAULT_CONNECTIVITY_INTERVAL 300 #define NM_CONFIG_DEFAULT_CONNECTIVITY_INTERVAL 300
+#define NM_CONFIG_DEFAULT_CONNECTIVITY_TIMEOUT 20 +#define NM_CONFIG_DEFAULT_CONNECTIVITY_TIMEOUT 20
#define NM_CONFIG_DEFAULT_CONNECTIVITY_RESPONSE "NetworkManager is online" /* NOT LOCALIZED */ #define NM_CONFIG_DEFAULT_CONNECTIVITY_RESPONSE "NetworkManager is online" /* NOT LOCALIZED */
#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/core/nm-connectivity.c b/src/core/nm-connectivity.c
index aee6c57..274a909 100644 index f847c8f4ef..597fa1aef5 100644
--- a/src/nm-connectivity.c --- a/src/core/nm-connectivity.c
+++ b/src/nm-connectivity.c +++ b/src/core/nm-connectivity.c
@@ -121,6 +121,7 @@ typedef struct { @@ -108,6 +108,7 @@ typedef struct {
CList completed_handles_lst_head; CList completed_handles_lst_head;
NMConfig *config; NMConfig * config;
ConConfig *con_config; ConConfig *con_config;
+ guint timeout; + guint timeout;
guint interval; guint interval;
bool enabled:1; bool enabled : 1;
@@ -668,6 +669,7 @@ _idle_cb (gpointer user_data) @@ -649,6 +650,7 @@ _idle_cb(gpointer user_data)
static void static void
do_curl_request (NMConnectivityCheckHandle *cb_data) do_curl_request(NMConnectivityCheckHandle *cb_data)
{ {
+ NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (cb_data->self); + NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (cb_data->self);
CURLM *mhandle; CURLM *mhandle;
CURL *ehandle; CURL * ehandle;
long resolve; long resolve;
@@ -688,7 +690,7 @@ do_curl_request (NMConnectivityCheckHandle *cb_data) @@ -669,7 +671,7 @@ do_curl_request(NMConnectivityCheckHandle *cb_data)
cb_data->concheck.curl_mhandle = mhandle; cb_data->concheck.curl_mhandle = mhandle;
cb_data->concheck.curl_ehandle = ehandle; cb_data->concheck.curl_ehandle = ehandle;
cb_data->concheck.request_headers = curl_slist_append (NULL, "Connection: close"); 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(20, _timeout_cb, cb_data);
+ cb_data->timeout_id = g_timeout_add_seconds (priv->timeout, _timeout_cb, cb_data); + cb_data->timeout_id = g_timeout_add_seconds(priv->timeout, _timeout_cb, cb_data);
curl_multi_setopt (mhandle, CURLMOPT_SOCKETFUNCTION, multi_socket_cb); curl_multi_setopt(mhandle, CURLMOPT_SOCKETFUNCTION, multi_socket_cb);
curl_multi_setopt (mhandle, CURLMOPT_SOCKETDATA, cb_data); curl_multi_setopt(mhandle, CURLMOPT_SOCKETDATA, cb_data);
@@ -1079,6 +1081,7 @@ update_config (NMConnectivity *self, NMConfigData *config_data) @@ -1051,6 +1053,7 @@ update_config(NMConnectivity *self, NMConfigData *config_data)
{ {
NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (self); NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE(self);
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; const char * cur_uri = priv->con_config ? priv->con_config->uri : NULL;
@@ -1165,6 +1168,13 @@ update_config (NMConnectivity *self, NMConfigData *config_data) @@ -1137,6 +1140,13 @@ update_config(NMConnectivity *self, NMConfigData *config_data)
changed = TRUE; changed = TRUE;
} }
+ /* Set the timeout */ + /* Set the timeout */
+ timeout = nm_config_data_get_connectivity_timeout (config_data); + timeout = nm_config_data_get_connectivity_timeout(config_data);
+ if (priv->timeout != timeout) { + if (priv->timeout != timeout) {
+ priv->timeout = timeout; + priv->timeout = timeout;
+ changed = TRUE; + changed = TRUE;
+ } + }
+ +
if (changed) if (changed)
g_signal_emit (self, signals[CONFIG_CHANGED], 0); g_signal_emit(self, signals[CONFIG_CHANGED], 0);
} }