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

kirkstone migration: update networkmanager package 

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2022-05-25 14:23:45 +02:00
parent 16550c1952
commit 831e6dbc5f
2 changed files with 85 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
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 Subject: [PATCH] networkmanager: trigger dispatcher on per-device connectivity
connectivity loss 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
@ -12,29 +12,17 @@ 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> Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
--- ---
.../nm-libnm-core-aux/nm-dispatcher-api.h | 1 +
src/core/devices/nm-device.c | 4 ++ src/core/devices/nm-device.c | 4 ++
src/core/nm-dispatcher.c | 42 ++++++++++++++++++- src/core/nm-dispatcher.c | 48 ++++++++++++++++++-
src/core/nm-dispatcher.h | 10 ++++- src/core/nm-dispatcher.h | 10 +++-
4 files changed, 55 insertions(+), 2 deletions(-) src/libnm-core-aux-extern/nm-dispatcher-api.h | 1 +
4 files changed, 61 insertions(+), 2 deletions(-)
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 7776c84f9a..265fc29ee0 100644
--- a/libnm-core/nm-libnm-core-aux/nm-dispatcher-api.h
+++ b/libnm-core/nm-libnm-core-aux/nm-dispatcher-api.h
@@ -33,6 +33,7 @@
#define NMD_ACTION_DHCP4_CHANGE "dhcp4-change"
#define NMD_ACTION_DHCP6_CHANGE "dhcp6-change"
#define NMD_ACTION_CONNECTIVITY_CHANGE "connectivity-change"
+#define NMD_ACTION_DEVICE_CONNECTIVITY_CHANGE "device-connectivity-change"
typedef enum {
DISPATCH_RESULT_UNKNOWN = 0,
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
index 5eaf8c23e7..d1444eb36f 100644 index a11486d54be3..5ea99dc67d37 100644
--- a/src/core/devices/nm-device.c --- a/src/core/devices/nm-device.c
+++ b/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c
@@ -4325,6 +4325,10 @@ concheck_update_state(NMDevice * self, @@ -5561,6 +5561,10 @@ concheck_update_state(NMDevice *self,
"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));
@ -46,12 +34,12 @@ index 5eaf8c23e7..d1444eb36f 100644
_notify(self, IS_IPv4 ? PROP_IP4_CONNECTIVITY : PROP_IP6_CONNECTIVITY); _notify(self, IS_IPv4 ? PROP_IP4_CONNECTIVITY : PROP_IP6_CONNECTIVITY);
diff --git a/src/core/nm-dispatcher.c b/src/core/nm-dispatcher.c diff --git a/src/core/nm-dispatcher.c b/src/core/nm-dispatcher.c
index 0ab409f5ed..3121662920 100644 index b6ff25ca45c6..aee3b6714c8c 100644
--- a/src/core/nm-dispatcher.c --- a/src/core/nm-dispatcher.c
+++ b/src/core/nm-dispatcher.c +++ b/src/core/nm-dispatcher.c
@@ -466,7 +466,9 @@ static const char *action_table[] = {[NM_DISPATCHER_ACTION_HOSTNAME] = NMD_A @@ -440,7 +440,9 @@ static const char *action_table[] = {[NM_DISPATCHER_ACTION_HOSTNAME] = NMD_
[NM_DISPATCHER_ACTION_DHCP4_CHANGE] = NMD_ACTION_DHCP4_CHANGE, [NM_DISPATCHER_ACTION_DHCP_CHANGE_4] = NMD_ACTION_DHCP4_CHANGE,
[NM_DISPATCHER_ACTION_DHCP6_CHANGE] = NMD_ACTION_DHCP6_CHANGE, [NM_DISPATCHER_ACTION_DHCP_CHANGE_6] = NMD_ACTION_DHCP6_CHANGE,
[NM_DISPATCHER_ACTION_CONNECTIVITY_CHANGE] = [NM_DISPATCHER_ACTION_CONNECTIVITY_CHANGE] =
- NMD_ACTION_CONNECTIVITY_CHANGE}; - NMD_ACTION_CONNECTIVITY_CHANGE};
+ NMD_ACTION_CONNECTIVITY_CHANGE, + NMD_ACTION_CONNECTIVITY_CHANGE,
@ -60,7 +48,7 @@ index 0ab409f5ed..3121662920 100644
static const char * static const char *
action_to_string(NMDispatcherAction action) action_to_string(NMDispatcherAction action)
@@ -926,6 +928,44 @@ nm_dispatcher_call_connectivity(NMConnectivityState connectivity_state, @@ -873,6 +875,50 @@ nm_dispatcher_call_connectivity(NMConnectivityState connectivity_state,
out_call_id); out_call_id);
} }
@ -79,47 +67,53 @@ index 0ab409f5ed..3121662920 100644
+ */ + */
+gboolean +gboolean
+nm_dispatcher_call_device_connectivity(NMConnectivityState connectivity_state, +nm_dispatcher_call_device_connectivity(NMConnectivityState connectivity_state,
+ NMDevice *device, + NMDevice *device,
+ NMDispatcherFunc callback, + NMDispatcherFunc callback,
+ gpointer user_data, + gpointer user_data,
+ NMDispatcherCallId **out_call_id) + NMDispatcherCallId **out_call_id)
+{ +{
+ NMActRequest *act_request; + NMActRequest *act_request;
+ +
+ nm_assert(NM_IS_DEVICE(device)); + nm_assert(NM_IS_DEVICE(device));
+ +
+ act_request = nm_device_get_act_request(device); + act_request = nm_device_get_act_request(device);
+ if (!act_request) + if (!act_request)
+ return FALSE; + return FALSE;
+ +
+ nm_assert(NM_IN_SET(nm_active_connection_get_device(NM_ACTIVE_CONNECTION(act_request)), NULL, device)); + nm_assert(NM_IN_SET(nm_active_connection_get_device(NM_ACTIVE_CONNECTION(act_request)), NULL, device));
+ return _dispatcher_call(NM_DISPATCHER_ACTION_DEVICE_CONNECTIVITY_CHANGE, FALSE, device, + return _dispatcher_call(
+ nm_act_request_get_settings_connection(act_request), + NM_DISPATCHER_ACTION_DEVICE_CONNECTIVITY_CHANGE,
+ nm_act_request_get_applied_connection(act_request), + FALSE,
+ nm_active_connection_get_activation_type(NM_ACTIVE_CONNECTION(act_request)) == NM_ACTIVATION_TYPE_EXTERNAL, + device,
+ connectivity_state, + nm_act_request_get_settings_connection(act_request),
+ NULL, NULL, NULL, NULL, + nm_act_request_get_applied_connection(act_request),
+ callback, user_data, out_call_id); + nm_active_connection_get_activation_type(NM_ACTIVE_CONNECTION(act_request)) == NM_ACTIVATION_TYPE_EXTERNAL,
+ connectivity_state,
+ NULL,
+ NULL,
+ callback,
+ user_data,
+ out_call_id);
+} +}
+ +
void void
nm_dispatcher_call_cancel(NMDispatcherCallId *call_id) nm_dispatcher_call_cancel(NMDispatcherCallId *call_id)
{ {
diff --git a/src/core/nm-dispatcher.h b/src/core/nm-dispatcher.h diff --git a/src/core/nm-dispatcher.h b/src/core/nm-dispatcher.h
index d588de4e8f..ff966be4df 100644 index 73e0599a75f2..6b953bb6dded 100644
--- a/src/core/nm-dispatcher.h --- a/src/core/nm-dispatcher.h
+++ b/src/core/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_DHCP_CHANGE_4,
NM_DISPATCHER_ACTION_DHCP6_CHANGE, NM_DISPATCHER_ACTION_DHCP_CHANGE_6,
- 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; #define NM_DISPATCHER_ACTION_DHCP_CHANGE_X(IS_IPv4) \
@@ -69,6 +70,13 @@ gboolean nm_dispatcher_call_connectivity(NMConnectivityState state, @@ -68,6 +69,13 @@ gboolean nm_dispatcher_call_connectivity(NMConnectivityState state,
gpointer user_data, gpointer user_data,
NMDispatcherCallId **out_call_id); NMDispatcherCallId **out_call_id);
@ -133,3 +127,15 @@ index d588de4e8f..ff966be4df 100644
void nm_dispatcher_call_cancel(NMDispatcherCallId *call_id); void nm_dispatcher_call_cancel(NMDispatcherCallId *call_id);
#endif /* __NM_DISPATCHER_H__ */ #endif /* __NM_DISPATCHER_H__ */
diff --git a/src/libnm-core-aux-extern/nm-dispatcher-api.h b/src/libnm-core-aux-extern/nm-dispatcher-api.h
index 7776c84f9a4a..265fc29ee049 100644
--- a/src/libnm-core-aux-extern/nm-dispatcher-api.h
+++ b/src/libnm-core-aux-extern/nm-dispatcher-api.h
@@ -33,6 +33,7 @@
#define NMD_ACTION_DHCP4_CHANGE "dhcp4-change"
#define NMD_ACTION_DHCP6_CHANGE "dhcp6-change"
#define NMD_ACTION_CONNECTIVITY_CHANGE "connectivity-change"
+#define NMD_ACTION_DEVICE_CONNECTIVITY_CHANGE "device-connectivity-change"
typedef enum {
DISPATCH_RESULT_UNKNOWN = 0,

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

@ -17,10 +17,10 @@ Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
5 files changed, 66 insertions(+), 1 deletion(-) 5 files changed, 66 insertions(+), 1 deletion(-)
diff --git a/src/core/nm-config-data.c b/src/core/nm-config-data.c diff --git a/src/core/nm-config-data.c b/src/core/nm-config-data.c
index c62c677372..64524403dd 100644 index ddb7787feffa..e1774ead4090 100644
--- a/src/core/nm-config-data.c --- a/src/core/nm-config-data.c
+++ b/src/core/nm-config-data.c +++ b/src/core/nm-config-data.c
@@ -51,6 +51,7 @@ NM_GOBJECT_PROPERTIES_DEFINE_BASE(PROP_CONFIG_MAIN_FILE, @@ -62,6 +62,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,
@ -28,15 +28,15 @@ index c62c677372..64524403dd 100644
PROP_CONNECTIVITY_RESPONSE, PROP_CONNECTIVITY_RESPONSE,
PROP_NO_AUTO_DEFAULT, ); PROP_NO_AUTO_DEFAULT, );
@@ -75,6 +76,7 @@ typedef struct { @@ -86,6 +87,7 @@ typedef struct {
char * uri; char *uri;
char * response; char *response;
guint interval; guint interval;
+ guint timeout; + guint timeout;
} connectivity; } connectivity;
int autoconnect_retries_default; int autoconnect_retries_default;
@@ -280,6 +282,14 @@ nm_config_data_get_connectivity_interval(const NMConfigData *self) @@ -298,6 +300,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;
} }
@ -51,16 +51,16 @@ index c62c677372..64524403dd 100644
const char * const char *
nm_config_data_get_connectivity_response(const NMConfigData *self) nm_config_data_get_connectivity_response(const NMConfigData *self)
{ {
@@ -1662,6 +1672,8 @@ nm_config_data_diff(NMConfigData *old_data, NMConfigData *new_data) @@ -1891,6 +1901,8 @@ nm_config_data_diff(NMConfigData *old_data, NMConfigData *new_data)
!= nm_config_data_get_connectivity_enabled(new_data) != nm_config_data_get_connectivity_enabled(new_data)
|| nm_config_data_get_connectivity_interval(old_data) || nm_config_data_get_connectivity_interval(old_data)
!= nm_config_data_get_connectivity_interval(new_data) != nm_config_data_get_connectivity_interval(new_data)
+ || nm_config_data_get_connectivity_timeout(old_data) + || nm_config_data_get_connectivity_timeout(old_data)
+ != nm_config_data_get_connectivity_timeout(new_data) + != nm_config_data_get_connectivity_timeout(new_data)
|| g_strcmp0(nm_config_data_get_connectivity_uri(old_data), || !nm_streq0(nm_config_data_get_connectivity_uri(old_data),
nm_config_data_get_connectivity_uri(new_data)) nm_config_data_get_connectivity_uri(new_data))
|| g_strcmp0(nm_config_data_get_connectivity_response(old_data), || !nm_streq0(nm_config_data_get_connectivity_response(old_data),
@@ -1734,6 +1746,9 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) @@ -1964,6 +1976,9 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
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;
@ -70,7 +70,7 @@ index c62c677372..64524403dd 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;
@@ -1878,6 +1893,19 @@ constructed(GObject *object) @@ -2106,6 +2121,19 @@ constructed(GObject *object)
NM_CONFIG_DEFAULT_CONNECTIVITY_INTERVAL); NM_CONFIG_DEFAULT_CONNECTIVITY_INTERVAL);
g_free(str); g_free(str);
@ -90,7 +90,7 @@ index c62c677372..64524403dd 100644
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,
@@ -2069,6 +2097,15 @@ nm_config_data_class_init(NMConfigDataClass *config_class) @@ -2305,6 +2333,15 @@ nm_config_data_class_init(NMConfigDataClass *config_class)
0, 0,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
@ -107,10 +107,10 @@ index c62c677372..64524403dd 100644
g_param_spec_string(NM_CONFIG_DATA_CONNECTIVITY_RESPONSE, g_param_spec_string(NM_CONFIG_DATA_CONNECTIVITY_RESPONSE,
"", "",
diff --git a/src/core/nm-config-data.h b/src/core/nm-config-data.h diff --git a/src/core/nm-config-data.h b/src/core/nm-config-data.h
index 07cffb436d..2cad35456d 100644 index fdc7e1fc3d2b..fa7a2814819e 100644
--- a/src/core/nm-config-data.h --- a/src/core/nm-config-data.h
+++ b/src/core/nm-config-data.h +++ b/src/core/nm-config-data.h
@@ -44,6 +44,7 @@ typedef enum { @@ -46,6 +46,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"
@ -118,7 +118,7 @@ index 07cffb436d..2cad35456d 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"
@@ -169,6 +170,7 @@ char ** nm_config_data_get_plugins(const NMConfigData *config_data, gboolean @@ -171,6 +172,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);
@ -127,7 +127,7 @@ index 07cffb436d..2cad35456d 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/core/nm-config.c b/src/core/nm-config.c diff --git a/src/core/nm-config.c b/src/core/nm-config.c
index 55323919af..b9a410c6fc 100644 index 60a2f1df53b2..864eadd9dd6c 100644
--- a/src/core/nm-config.c --- a/src/core/nm-config.c
+++ b/src/core/nm-config.c +++ b/src/core/nm-config.c
@@ -45,6 +45,7 @@ struct NMConfigCmdLineOptions { @@ -45,6 +45,7 @@ struct NMConfigCmdLineOptions {
@ -138,7 +138,7 @@ index 55323919af..b9a410c6fc 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
@@ -485,6 +486,7 @@ _nm_config_cmd_line_options_clear(NMConfigCmdLineOptions *cli) @@ -479,6 +480,7 @@ _nm_config_cmd_line_options_clear(NMConfigCmdLineOptions *cli)
nm_clear_g_free(&cli->connectivity_uri); nm_clear_g_free(&cli->connectivity_uri);
nm_clear_g_free(&cli->connectivity_response); nm_clear_g_free(&cli->connectivity_response);
cli->connectivity_interval = -1; cli->connectivity_interval = -1;
@ -146,7 +146,7 @@ index 55323919af..b9a410c6fc 100644
cli->first_start = FALSE; cli->first_start = FALSE;
} }
@@ -508,6 +510,7 @@ _nm_config_cmd_line_options_copy(const NMConfigCmdLineOptions *cli, NMConfigCmdL @@ -502,6 +504,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;
@ -154,7 +154,7 @@ index 55323919af..b9a410c6fc 100644
dst->first_start = cli->first_start; dst->first_start = cli->first_start;
} }
@@ -655,6 +658,13 @@ nm_config_cmd_line_options_add_to_entries(NMConfigCmdLineOptions *cli, GOptionCo @@ -652,6 +655,13 @@ nm_config_cmd_line_options_add_to_entries(NMConfigCmdLineOptions *cli, GOptionCo
&cli->connectivity_interval, &cli->connectivity_interval,
N_("The interval between connectivity checks (in seconds)"), N_("The interval between connectivity checks (in seconds)"),
G_STRINGIFY(NM_CONFIG_DEFAULT_CONNECTIVITY_INTERVAL)}, G_STRINGIFY(NM_CONFIG_DEFAULT_CONNECTIVITY_INTERVAL)},
@ -168,7 +168,7 @@ index 55323919af..b9a410c6fc 100644
{"connectivity-response", {"connectivity-response",
0, 0,
G_OPTION_FLAG_HIDDEN, G_OPTION_FLAG_HIDDEN,
@@ -1408,6 +1418,11 @@ read_entire_config(const NMConfigCmdLineOptions *cli, @@ -1412,6 +1422,11 @@ read_entire_config(const NMConfigCmdLineOptions *cli,
NM_CONFIG_KEYFILE_GROUP_CONNECTIVITY, NM_CONFIG_KEYFILE_GROUP_CONNECTIVITY,
"interval", "interval",
cli->connectivity_interval); cli->connectivity_interval);
@ -181,38 +181,38 @@ index 55323919af..b9a410c6fc 100644
g_key_file_set_string(keyfile, g_key_file_set_string(keyfile,
NM_CONFIG_KEYFILE_GROUP_CONNECTIVITY, NM_CONFIG_KEYFILE_GROUP_CONNECTIVITY,
diff --git a/src/core/nm-config.h b/src/core/nm-config.h diff --git a/src/core/nm-config.h b/src/core/nm-config.h
index 6f3f514c2b..b33960ba0f 100644 index 2c23ff200e1d..58c8b3e67712 100644
--- a/src/core/nm-config.h --- a/src/core/nm-config.h
+++ b/src/core/nm-config.h +++ b/src/core/nm-config.h
@@ -24,6 +24,7 @@ @@ -26,6 +26,7 @@
#define NM_CONFIG_SIGNAL_CONFIG_CHANGED "config-changed" #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 ',' typedef struct NMConfigCmdLineOptions NMConfigCmdLineOptions;
diff --git a/src/core/nm-connectivity.c b/src/core/nm-connectivity.c diff --git a/src/core/nm-connectivity.c b/src/core/nm-connectivity.c
index f847c8f4ef..597fa1aef5 100644 index 7199c9a242ad..46f5a8da1d9f 100644
--- a/src/core/nm-connectivity.c --- a/src/core/nm-connectivity.c
+++ b/src/core/nm-connectivity.c +++ b/src/core/nm-connectivity.c
@@ -108,6 +108,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;
@@ -649,6 +650,7 @@ _idle_cb(gpointer user_data) @@ -642,6 +643,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;
@@ -669,7 +671,7 @@ do_curl_request(NMConnectivityCheckHandle *cb_data) @@ -662,7 +664,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");
@ -221,15 +221,15 @@ index f847c8f4ef..597fa1aef5 100644
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);
@@ -1051,6 +1053,7 @@ update_config(NMConnectivity *self, NMConfigData *config_data) @@ -1044,6 +1046,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;
@@ -1137,6 +1140,13 @@ update_config(NMConnectivity *self, NMConfigData *config_data) @@ -1130,6 +1133,13 @@ update_config(NMConnectivity *self, NMConfigData *config_data)
changed = TRUE; changed = TRUE;
} }