Commit 5828a4b0 authored by Dan Winship's avatar Dan Winship

connectivity: merge branch 'danw/connectivity-bgo742823'

https://bugzilla.gnome.org/show_bug.cgi?id=742823
parents 233498e0 66b8f2b7
...@@ -44,7 +44,7 @@ typedef struct { ...@@ -44,7 +44,7 @@ typedef struct {
#if WITH_CONCHECK #if WITH_CONCHECK
SoupSession *soup_session; SoupSession *soup_session;
gboolean running; guint pending_checks;
guint check_id; guint check_id;
#endif #endif
...@@ -69,12 +69,33 @@ nm_connectivity_get_state (NMConnectivity *connectivity) ...@@ -69,12 +69,33 @@ nm_connectivity_get_state (NMConnectivity *connectivity)
return NM_CONNECTIVITY_GET_PRIVATE (connectivity)->state; return NM_CONNECTIVITY_GET_PRIVATE (connectivity)->state;
} }
static const char *
state_name (NMConnectivityState state)
{
switch (state) {
case NM_CONNECTIVITY_UNKNOWN:
return "UNKNOWN";
case NM_CONNECTIVITY_NONE:
return "NONE";
case NM_CONNECTIVITY_LIMITED:
return "LIMITED";
case NM_CONNECTIVITY_PORTAL:
return "PORTAL";
case NM_CONNECTIVITY_FULL:
return "FULL";
default:
return "???";
}
}
static void static void
update_state (NMConnectivity *self, NMConnectivityState state) update_state (NMConnectivity *self, NMConnectivityState state)
{ {
NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (self); NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (self);
if (priv->state != state) { if (priv->state != state) {
nm_log_dbg (LOGD_CONCHECK, "Connectivity state changed from %s to %s",
state_name (priv->state), state_name (state));
priv->state = state; priv->state = state;
g_object_notify (G_OBJECT (self), NM_CONNECTIVITY_STATE); g_object_notify (G_OBJECT (self), NM_CONNECTIVITY_STATE);
} }
...@@ -93,6 +114,7 @@ nm_connectivity_check_cb (SoupSession *session, SoupMessage *msg, gpointer user_ ...@@ -93,6 +114,7 @@ nm_connectivity_check_cb (SoupSession *session, SoupMessage *msg, gpointer user_
self = NM_CONNECTIVITY (g_async_result_get_source_object (G_ASYNC_RESULT (simple))); self = NM_CONNECTIVITY (g_async_result_get_source_object (G_ASYNC_RESULT (simple)));
g_object_unref (self); g_object_unref (self);
priv = NM_CONNECTIVITY_GET_PRIVATE (self); priv = NM_CONNECTIVITY_GET_PRIVATE (self);
priv->pending_checks--;
if (SOUP_STATUS_IS_TRANSPORT_ERROR (msg->status_code)) { if (SOUP_STATUS_IS_TRANSPORT_ERROR (msg->status_code)) {
nm_log_info (LOGD_CONCHECK, "Connectivity check for uri '%s' failed with '%s'.", nm_log_info (LOGD_CONCHECK, "Connectivity check for uri '%s' failed with '%s'.",
...@@ -124,10 +146,10 @@ nm_connectivity_check_cb (SoupSession *session, SoupMessage *msg, gpointer user_ ...@@ -124,10 +146,10 @@ nm_connectivity_check_cb (SoupSession *session, SoupMessage *msg, gpointer user_
} }
done: done:
update_state (self, new_state);
g_simple_async_result_set_op_res_gssize (simple, new_state); g_simple_async_result_set_op_res_gssize (simple, new_state);
g_simple_async_result_complete (simple); g_simple_async_result_complete (simple);
update_state (self, new_state);
} }
static void static void
...@@ -136,11 +158,9 @@ run_check_complete (GObject *object, ...@@ -136,11 +158,9 @@ run_check_complete (GObject *object,
gpointer user_data) gpointer user_data)
{ {
NMConnectivity *self = NM_CONNECTIVITY (object); NMConnectivity *self = NM_CONNECTIVITY (object);
NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (self);
GError *error = NULL; GError *error = NULL;
nm_connectivity_check_finish (self, result, &error); nm_connectivity_check_finish (self, result, &error);
priv->running = FALSE;
if (error) { if (error) {
nm_log_err (LOGD_CONCHECK, "Connectivity check failed: %s", error->message); nm_log_err (LOGD_CONCHECK, "Connectivity check failed: %s", error->message);
g_error_free (error); g_error_free (error);
...@@ -151,14 +171,23 @@ static gboolean ...@@ -151,14 +171,23 @@ static gboolean
run_check (gpointer user_data) run_check (gpointer user_data)
{ {
NMConnectivity *self = NM_CONNECTIVITY (user_data); NMConnectivity *self = NM_CONNECTIVITY (user_data);
NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (self);
nm_connectivity_check_async (self, run_check_complete, NULL); nm_connectivity_check_async (self, run_check_complete, NULL);
priv->running = TRUE;
nm_log_dbg (LOGD_CONCHECK, "Connectivity check with uri '%s' started.", priv->uri);
return TRUE; return TRUE;
} }
static gboolean
idle_start_periodic_checks (gpointer user_data)
{
NMConnectivity *self = user_data;
NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (self);
priv->check_id = g_timeout_add_seconds (priv->interval, run_check, self);
if (!priv->pending_checks)
run_check (self);
return FALSE;
}
#endif #endif
void void
...@@ -167,12 +196,14 @@ nm_connectivity_set_online (NMConnectivity *self, ...@@ -167,12 +196,14 @@ nm_connectivity_set_online (NMConnectivity *self,
{ {
#if WITH_CONCHECK #if WITH_CONCHECK
NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (self); NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (self);
#endif
nm_log_dbg (LOGD_CONCHECK, "nm_connectivity_set_online(%s)", online ? "TRUE" : "FALSE");
#if WITH_CONCHECK
if (online && priv->uri && priv->interval) { if (online && priv->uri && priv->interval) {
if (!priv->check_id) if (!priv->check_id)
priv->check_id = g_timeout_add_seconds (priv->interval, run_check, self); priv->check_id = g_timeout_add (0, idle_start_periodic_checks, self);
if (!priv->running)
run_check (self);
return; return;
} else if (priv->check_id) { } else if (priv->check_id) {
...@@ -201,6 +232,11 @@ nm_connectivity_check_async (NMConnectivity *self, ...@@ -201,6 +232,11 @@ nm_connectivity_check_async (NMConnectivity *self,
g_return_if_fail (NM_IS_CONNECTIVITY (self)); g_return_if_fail (NM_IS_CONNECTIVITY (self));
priv = NM_CONNECTIVITY_GET_PRIVATE (self); priv = NM_CONNECTIVITY_GET_PRIVATE (self);
if (callback == run_check_complete)
nm_log_dbg (LOGD_CONCHECK, "Periodic connectivity check started with uri '%s'.", priv->uri);
else
nm_log_dbg (LOGD_CONCHECK, "Connectivity check started with uri '%s'.", priv->uri);
simple = g_simple_async_result_new (G_OBJECT (self), callback, user_data, simple = g_simple_async_result_new (G_OBJECT (self), callback, user_data,
nm_connectivity_check_async); nm_connectivity_check_async);
...@@ -212,6 +248,7 @@ nm_connectivity_check_async (NMConnectivity *self, ...@@ -212,6 +248,7 @@ nm_connectivity_check_async (NMConnectivity *self,
msg, msg,
nm_connectivity_check_cb, nm_connectivity_check_cb,
simple); simple);
priv->pending_checks++;
return; return;
} }
......
...@@ -578,7 +578,7 @@ checked_connectivity (GObject *object, GAsyncResult *result, gpointer user_data) ...@@ -578,7 +578,7 @@ checked_connectivity (GObject *object, GAsyncResult *result, gpointer user_data)
} }
static NMState static NMState
find_best_device_state (NMManager *manager, gboolean *want_connectivity_check) find_best_device_state (NMManager *manager)
{ {
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager); NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager);
NMState best_state = NM_STATE_DISCONNECTED; NMState best_state = NM_STATE_DISCONNECTED;
...@@ -592,14 +592,10 @@ find_best_device_state (NMManager *manager, gboolean *want_connectivity_check) ...@@ -592,14 +592,10 @@ find_best_device_state (NMManager *manager, gboolean *want_connectivity_check)
case NM_ACTIVE_CONNECTION_STATE_ACTIVATED: case NM_ACTIVE_CONNECTION_STATE_ACTIVATED:
if ( nm_active_connection_get_default (ac) if ( nm_active_connection_get_default (ac)
|| nm_active_connection_get_default6 (ac)) { || nm_active_connection_get_default6 (ac)) {
nm_connectivity_set_online (priv->connectivity, TRUE); if (nm_connectivity_get_state (priv->connectivity) == NM_CONNECTIVITY_FULL)
if (nm_connectivity_get_state (priv->connectivity) == NM_CONNECTIVITY_FULL) {
*want_connectivity_check = FALSE;
return NM_STATE_CONNECTED_GLOBAL; return NM_STATE_CONNECTED_GLOBAL;
}
best_state = NM_STATE_CONNECTING; best_state = NM_STATE_CONNECTED_SITE;
*want_connectivity_check = TRUE;
} else { } else {
if (best_state < NM_STATE_CONNECTING) if (best_state < NM_STATE_CONNECTING)
best_state = NM_STATE_CONNECTED_LOCAL; best_state = NM_STATE_CONNECTED_LOCAL;
...@@ -630,7 +626,6 @@ nm_manager_update_state (NMManager *manager) ...@@ -630,7 +626,6 @@ nm_manager_update_state (NMManager *manager)
{ {
NMManagerPrivate *priv; NMManagerPrivate *priv;
NMState new_state = NM_STATE_DISCONNECTED; NMState new_state = NM_STATE_DISCONNECTED;
gboolean want_connectivity_check = FALSE;
g_return_if_fail (NM_IS_MANAGER (manager)); g_return_if_fail (NM_IS_MANAGER (manager));
...@@ -639,14 +634,15 @@ nm_manager_update_state (NMManager *manager) ...@@ -639,14 +634,15 @@ nm_manager_update_state (NMManager *manager)
if (manager_sleeping (manager)) if (manager_sleeping (manager))
new_state = NM_STATE_ASLEEP; new_state = NM_STATE_ASLEEP;
else else
new_state = find_best_device_state (manager, &want_connectivity_check); new_state = find_best_device_state (manager);
nm_connectivity_set_online (priv->connectivity, new_state >= NM_STATE_CONNECTED_LOCAL);
if (new_state == NM_STATE_CONNECTING && want_connectivity_check) { if (new_state == NM_STATE_CONNECTED_SITE) {
nm_connectivity_check_async (priv->connectivity, nm_connectivity_check_async (priv->connectivity,
checked_connectivity, checked_connectivity,
g_object_ref (manager)); g_object_ref (manager));
} else }
nm_connectivity_set_online (priv->connectivity, new_state >= NM_STATE_CONNECTED_LOCAL);
set_state (manager, new_state); set_state (manager, new_state);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment