fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 15:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: add LOGD_CONCHECK, log unexpected concheck responses at LOGL_INFO

Browse source
This commit is contained in:
Dan Winship 2013-07-31 10:14:25 -04:00
parent 91f810abfe
commit 52813b48c1
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/logging/nm-logging.c
View file

@ -49,7 +49,7 @@ nm_log_handler (const gchar *log_domain,
LOGD_SUPPLICANT | LOGD_AGENTS | LOGD_SETTINGS | LOGD_SUSPEND | \
LOGD_CORE | LOGD_DEVICE | LOGD_OLPC_MESH | LOGD_WIMAX | \
LOGD_INFINIBAND | LOGD_FIREWALL | LOGD_ADSL | LOGD_BOND | \
LOGD_VLAN | LOGD_BRIDGE | LOGD_DBUS_PROPS | LOGD_TEAM)
LOGD_VLAN | LOGD_BRIDGE | LOGD_DBUS_PROPS | LOGD_TEAM | LOGD_CONCHECK)
#define LOGD_DEFAULT (LOGD_ALL & ~(LOGD_WIFI_SCAN | LOGD_DBUS_PROPS))
@ -104,6 +104,7 @@ static const LogDesc domain_descs[] = {
{ LOGD_BRIDGE, "BRIDGE" },
{ LOGD_DBUS_PROPS,"DBUS_PROPS" },
{ LOGD_TEAM, "TEAM" },
{ LOGD_CONCHECK, "CONCHECK" },
{ 0, NULL }
};

1
src/logging/nm-logging.h
View file

@ -60,6 +60,7 @@ enum {
LOGD_BRIDGE = (1LL << 30),
LOGD_DBUS_PROPS = (1LL << 31),
LOGD_TEAM = (1LL << 32),
LOGD_CONCHECK = (1LL << 33),
};
#define LOGD_DHCP (LOGD_DHCP4 | LOGD_DHCP6)

19
src/nm-connectivity.c
View file

@ -101,18 +101,21 @@ nm_connectivity_check_cb (SoupSession *session, SoupMessage *msg, gpointer user_
/* 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_CORE, "Connectivity check for uri '%s' with Status header successful.", priv->uri);
nm_log_dbg (LOGD_CONCHECK, "Connectivity check for uri '%s' with Status header successful.", priv->uri);
connected_new = TRUE;
} else {
} 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_CORE, "Connectivity check for uri '%s' with expected response '%s' successful.",
priv->uri, priv->response);
nm_log_dbg (LOGD_CONCHECK, "Connectivity check for uri '%s' successful.",
priv->uri);
connected_new = TRUE;
} else {
nm_log_dbg (LOGD_CORE, "Connectivity check for uri '%s' with expected response '%s' failed (status %d).",
priv->uri, priv->response, msg->status_code);
nm_log_info (LOGD_CONCHECK, "Connectivity check for uri '%s' did not match expected response '%s'.",
priv->uri, priv->response);
}
} else {
nm_log_info (LOGD_CONCHECK, "Connectivity check for uri '%s' returned status '%d %s'.",
priv->uri, msg->status_code, msg->reason_phrase);
}
/* update connectivity and emit signal */
@ -141,7 +144,7 @@ run_check (gpointer user_data)
self);
priv->running = TRUE;
nm_log_dbg (LOGD_CORE, "Connectivity check with uri '%s' started.", priv->uri);
nm_log_dbg (LOGD_CONCHECK, "Connectivity check with uri '%s' started.", priv->uri);
return TRUE;
}
#endif
@ -230,7 +233,7 @@ set_property (GObject *object, guint property_id,
SoupURI *uri = soup_uri_new (priv->uri);
if (!uri || !SOUP_URI_VALID_FOR_HTTP (uri)) {
nm_log_err (LOGD_CORE, "Invalid uri '%s' for connectivity check.", priv->uri);
nm_log_err (LOGD_CONCHECK, "Invalid uri '%s' for connectivity check.", priv->uri);
g_free (priv->uri);
priv->uri = NULL;
}