mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-27 21:00:10 +01:00
nm-connectivity was logging both "started" and "finished" for periodic
connectivity checks, but was only logging "finished" for manual ones,
which made the logs look weird. Fix it to log both periodic and manual
starts, and differentiate them.
Also add some additional logging to indicate when set_online() is
called, and when :state changes.
(cherry picked from commit 53f2642c73)
440 lines
12 KiB
C
440 lines
12 KiB
C
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
|
/* NetworkManager -- Network link manager
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*
|
|
* Copyright (C) 2011 Thomas Bechtold <thomasbechtold@jpberlin.de>
|
|
* Copyright (C) 2011 Dan Williams <dcbw@redhat.com>
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <string.h>
|
|
#if WITH_CONCHECK
|
|
#include <libsoup/soup.h>
|
|
#endif
|
|
|
|
#include "nm-connectivity.h"
|
|
#include "nm-logging.h"
|
|
#include "nm-config.h"
|
|
|
|
G_DEFINE_TYPE (NMConnectivity, nm_connectivity, G_TYPE_OBJECT)
|
|
|
|
#define NM_CONNECTIVITY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_CONNECTIVITY, NMConnectivityPrivate))
|
|
|
|
|
|
#define DEFAULT_RESPONSE "NetworkManager is online" /* NOT LOCALIZED */
|
|
|
|
typedef struct {
|
|
char *uri;
|
|
char *response;
|
|
guint interval;
|
|
|
|
#if WITH_CONCHECK
|
|
SoupSession *soup_session;
|
|
gboolean running;
|
|
guint check_id;
|
|
#endif
|
|
|
|
NMConnectivityState state;
|
|
} NMConnectivityPrivate;
|
|
|
|
enum {
|
|
PROP_0,
|
|
PROP_URI,
|
|
PROP_INTERVAL,
|
|
PROP_RESPONSE,
|
|
PROP_STATE,
|
|
LAST_PROP
|
|
};
|
|
|
|
|
|
NMConnectivityState
|
|
nm_connectivity_get_state (NMConnectivity *connectivity)
|
|
{
|
|
g_return_val_if_fail (NM_IS_CONNECTIVITY (connectivity), NM_CONNECTIVITY_UNKNOWN);
|
|
|
|
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
|
|
update_state (NMConnectivity *self, NMConnectivityState state)
|
|
{
|
|
NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (self);
|
|
|
|
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;
|
|
g_object_notify (G_OBJECT (self), NM_CONNECTIVITY_STATE);
|
|
}
|
|
}
|
|
|
|
#if WITH_CONCHECK
|
|
static void
|
|
nm_connectivity_check_cb (SoupSession *session, SoupMessage *msg, gpointer user_data)
|
|
{
|
|
GSimpleAsyncResult *simple = user_data;
|
|
NMConnectivity *self;
|
|
NMConnectivityPrivate *priv;
|
|
NMConnectivityState new_state;
|
|
const char *nm_header;
|
|
|
|
self = NM_CONNECTIVITY (g_async_result_get_source_object (G_ASYNC_RESULT (simple)));
|
|
g_object_unref (self);
|
|
priv = NM_CONNECTIVITY_GET_PRIVATE (self);
|
|
|
|
if (SOUP_STATUS_IS_TRANSPORT_ERROR (msg->status_code)) {
|
|
nm_log_info (LOGD_CONCHECK, "Connectivity check for uri '%s' failed with '%s'.",
|
|
priv->uri, msg->reason_phrase);
|
|
new_state = NM_CONNECTIVITY_LIMITED;
|
|
goto done;
|
|
}
|
|
|
|
/* Check headers; if we find the NM-specific one we're done */
|
|
nm_header = soup_message_headers_get_one (msg->response_headers, "X-NetworkManager-Status");
|
|
if (g_strcmp0 (nm_header, "online") == 0) {
|
|
nm_log_dbg (LOGD_CONCHECK, "Connectivity check for uri '%s' with Status header successful.", priv->uri);
|
|
new_state = NM_CONNECTIVITY_FULL;
|
|
} else if (msg->status_code == SOUP_STATUS_OK) {
|
|
/* check response */
|
|
if (msg->response_body->data && (g_str_has_prefix (msg->response_body->data, priv->response))) {
|
|
nm_log_dbg (LOGD_CONCHECK, "Connectivity check for uri '%s' successful.",
|
|
priv->uri);
|
|
new_state = NM_CONNECTIVITY_FULL;
|
|
} else {
|
|
nm_log_info (LOGD_CONCHECK, "Connectivity check for uri '%s' did not match expected response '%s'; assuming captive portal.",
|
|
priv->uri, priv->response);
|
|
new_state = NM_CONNECTIVITY_PORTAL;
|
|
}
|
|
} else {
|
|
nm_log_info (LOGD_CONCHECK, "Connectivity check for uri '%s' returned status '%d %s'; assuming captive portal.",
|
|
priv->uri, msg->status_code, msg->reason_phrase);
|
|
new_state = NM_CONNECTIVITY_PORTAL;
|
|
}
|
|
|
|
done:
|
|
g_simple_async_result_set_op_res_gssize (simple, new_state);
|
|
g_simple_async_result_complete (simple);
|
|
|
|
update_state (self, new_state);
|
|
}
|
|
|
|
static void
|
|
run_check_complete (GObject *object,
|
|
GAsyncResult *result,
|
|
gpointer user_data)
|
|
{
|
|
NMConnectivity *self = NM_CONNECTIVITY (object);
|
|
NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (self);
|
|
GError *error = NULL;
|
|
|
|
nm_connectivity_check_finish (self, result, &error);
|
|
priv->running = FALSE;
|
|
if (error) {
|
|
nm_log_err (LOGD_CONCHECK, "Connectivity check failed: %s", error->message);
|
|
g_error_free (error);
|
|
}
|
|
}
|
|
|
|
static gboolean
|
|
run_check (gpointer user_data)
|
|
{
|
|
NMConnectivity *self = NM_CONNECTIVITY (user_data);
|
|
NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (self);
|
|
|
|
nm_connectivity_check_async (self, run_check_complete, NULL);
|
|
priv->running = TRUE;
|
|
|
|
return TRUE;
|
|
}
|
|
#endif
|
|
|
|
void
|
|
nm_connectivity_set_online (NMConnectivity *self,
|
|
gboolean online)
|
|
{
|
|
#if WITH_CONCHECK
|
|
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 (!priv->check_id)
|
|
priv->check_id = g_timeout_add_seconds (priv->interval, run_check, self);
|
|
if (!priv->running)
|
|
run_check (self);
|
|
|
|
return;
|
|
} else if (priv->check_id) {
|
|
g_source_remove (priv->check_id);
|
|
priv->check_id = 0;
|
|
}
|
|
#endif
|
|
|
|
/* Either @online is %TRUE but we aren't checking connectivity, or
|
|
* @online is %FALSE. Either way we can update our status immediately.
|
|
*/
|
|
update_state (self, online ? NM_CONNECTIVITY_FULL : NM_CONNECTIVITY_NONE);
|
|
}
|
|
|
|
void
|
|
nm_connectivity_check_async (NMConnectivity *self,
|
|
GAsyncReadyCallback callback,
|
|
gpointer user_data)
|
|
{
|
|
NMConnectivityPrivate *priv;
|
|
#if WITH_CONCHECK
|
|
SoupMessage *msg;
|
|
#endif
|
|
GSimpleAsyncResult *simple;
|
|
|
|
g_return_if_fail (NM_IS_CONNECTIVITY (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,
|
|
nm_connectivity_check_async);
|
|
|
|
#if WITH_CONCHECK
|
|
if (priv->uri && priv->interval) {
|
|
msg = soup_message_new ("GET", priv->uri);
|
|
soup_message_set_flags (msg, SOUP_MESSAGE_NO_REDIRECT);
|
|
soup_session_queue_message (priv->soup_session,
|
|
msg,
|
|
nm_connectivity_check_cb,
|
|
simple);
|
|
|
|
return;
|
|
}
|
|
#endif
|
|
|
|
g_simple_async_result_set_op_res_gssize (simple, priv->state);
|
|
g_simple_async_result_complete_in_idle (simple);
|
|
}
|
|
|
|
NMConnectivityState
|
|
nm_connectivity_check_finish (NMConnectivity *self,
|
|
GAsyncResult *result,
|
|
GError **error)
|
|
{
|
|
GSimpleAsyncResult *simple;
|
|
|
|
g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (self), nm_connectivity_check_async), NM_CONNECTIVITY_UNKNOWN);
|
|
|
|
simple = G_SIMPLE_ASYNC_RESULT (result);
|
|
if (g_simple_async_result_propagate_error (simple, error))
|
|
return NM_CONNECTIVITY_UNKNOWN;
|
|
return (NMConnectivityState) g_simple_async_result_get_op_res_gssize (simple);
|
|
}
|
|
|
|
|
|
NMConnectivity *
|
|
nm_connectivity_new (void)
|
|
{
|
|
NMConnectivity *self;
|
|
NMConfig *config;
|
|
const char *check_response;
|
|
|
|
config = nm_config_get ();
|
|
check_response = nm_config_get_connectivity_response (config);
|
|
|
|
self = g_object_new (NM_TYPE_CONNECTIVITY,
|
|
NM_CONNECTIVITY_URI, nm_config_get_connectivity_uri (config),
|
|
NM_CONNECTIVITY_INTERVAL, nm_config_get_connectivity_interval (config),
|
|
NM_CONNECTIVITY_RESPONSE, check_response ? check_response : DEFAULT_RESPONSE,
|
|
NULL);
|
|
g_return_val_if_fail (self != NULL, NULL);
|
|
update_state (self, NM_CONNECTIVITY_NONE);
|
|
|
|
return self;
|
|
}
|
|
|
|
static char *
|
|
get_non_empty_string_value (const GValue *val)
|
|
{
|
|
const char *s;
|
|
|
|
s = g_value_get_string (val);
|
|
if (s && s[0])
|
|
return g_strdup (s);
|
|
else
|
|
return NULL;
|
|
}
|
|
|
|
static void
|
|
set_property (GObject *object, guint property_id,
|
|
const GValue *value, GParamSpec *pspec)
|
|
{
|
|
NMConnectivity *self = NM_CONNECTIVITY (object);
|
|
NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (self);
|
|
|
|
switch (property_id) {
|
|
case PROP_URI:
|
|
g_free (priv->uri);
|
|
priv->uri = get_non_empty_string_value (value);
|
|
|
|
#if WITH_CONCHECK
|
|
if (priv->uri) {
|
|
SoupURI *uri = soup_uri_new (priv->uri);
|
|
|
|
if (!uri || !SOUP_URI_VALID_FOR_HTTP (uri)) {
|
|
nm_log_err (LOGD_CONCHECK, "Invalid uri '%s' for connectivity check.", priv->uri);
|
|
g_free (priv->uri);
|
|
priv->uri = NULL;
|
|
}
|
|
}
|
|
#endif
|
|
break;
|
|
case PROP_INTERVAL:
|
|
priv->interval = g_value_get_uint (value);
|
|
break;
|
|
case PROP_RESPONSE:
|
|
g_free (priv->response);
|
|
priv->response = get_non_empty_string_value (value);
|
|
break;
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
get_property (GObject *object, guint property_id,
|
|
GValue *value, GParamSpec *pspec)
|
|
{
|
|
NMConnectivity *self = NM_CONNECTIVITY (object);
|
|
NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (self);
|
|
|
|
switch (property_id) {
|
|
case PROP_URI:
|
|
g_value_set_string (value, priv->uri);
|
|
break;
|
|
case PROP_INTERVAL:
|
|
g_value_set_uint (value, priv->interval);
|
|
break;
|
|
case PROP_RESPONSE:
|
|
g_value_set_string (value, priv->response);
|
|
break;
|
|
case PROP_STATE:
|
|
g_value_set_uint (value, priv->state);
|
|
break;
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
static void
|
|
nm_connectivity_init (NMConnectivity *self)
|
|
{
|
|
#if WITH_CONCHECK
|
|
NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (self);
|
|
|
|
priv->soup_session = soup_session_async_new_with_options (SOUP_SESSION_TIMEOUT, 15, NULL);
|
|
#endif
|
|
}
|
|
|
|
|
|
static void
|
|
dispose (GObject *object)
|
|
{
|
|
NMConnectivity *self = NM_CONNECTIVITY (object);
|
|
NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (self);
|
|
|
|
g_free (priv->uri);
|
|
g_free (priv->response);
|
|
|
|
#if WITH_CONCHECK
|
|
if (priv->soup_session) {
|
|
soup_session_abort (priv->soup_session);
|
|
g_clear_object (&priv->soup_session);
|
|
}
|
|
|
|
if (priv->check_id > 0) {
|
|
g_source_remove (priv->check_id);
|
|
priv->check_id = 0;
|
|
}
|
|
#endif
|
|
}
|
|
|
|
|
|
static void
|
|
nm_connectivity_class_init (NMConnectivityClass *klass)
|
|
{
|
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
|
g_type_class_add_private (klass, sizeof (NMConnectivityPrivate));
|
|
|
|
/* virtual methods */
|
|
object_class->set_property = set_property;
|
|
object_class->get_property = get_property;
|
|
object_class->dispose = dispose;
|
|
|
|
/* properties */
|
|
g_object_class_install_property
|
|
(object_class, PROP_URI,
|
|
g_param_spec_string (NM_CONNECTIVITY_URI, "", "",
|
|
NULL,
|
|
G_PARAM_READWRITE |
|
|
G_PARAM_STATIC_STRINGS));
|
|
|
|
g_object_class_install_property
|
|
(object_class, PROP_INTERVAL,
|
|
g_param_spec_uint (NM_CONNECTIVITY_INTERVAL, "", "",
|
|
0, G_MAXUINT, 300,
|
|
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
|
|
G_PARAM_STATIC_STRINGS));
|
|
|
|
g_object_class_install_property
|
|
(object_class, PROP_RESPONSE,
|
|
g_param_spec_string (NM_CONNECTIVITY_RESPONSE, "", "",
|
|
DEFAULT_RESPONSE,
|
|
G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
|
|
G_PARAM_STATIC_STRINGS));
|
|
|
|
g_object_class_install_property
|
|
(object_class, PROP_STATE,
|
|
g_param_spec_uint (NM_CONNECTIVITY_STATE, "", "",
|
|
NM_CONNECTIVITY_UNKNOWN, NM_CONNECTIVITY_FULL, NM_CONNECTIVITY_UNKNOWN,
|
|
G_PARAM_READABLE |
|
|
G_PARAM_STATIC_STRINGS));
|
|
}
|
|
|