From 76c7d2f95c57d318d867bcd63633eaaf0727d1dd Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Sun, 2 Jan 2011 22:16:22 -0600 Subject: [PATCH] logging: add WiMAX log domain --- man/NetworkManager.conf.5.in | 10 +++++----- src/logging/nm-logging.c | 4 +++- src/logging/nm-logging.h | 1 + 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/man/NetworkManager.conf.5.in b/man/NetworkManager.conf.5.in index c866f1b337..a45adde8c7 100644 --- a/man/NetworkManager.conf.5.in +++ b/man/NetworkManager.conf.5.in @@ -162,11 +162,11 @@ warning messages. .B domains=\fI,, ...\fP The following log domains are available: [NONE, HW, RKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, -USER_SET, SYS_SET, SUSPEND, CORE, DEVICE, OLPC]. When "NONE" is given by itself, -logging is disabled. MB = Mobile Broadband, USER_SET = user settings operations -and communication, SYS_SET = system settings service operations, OLPC = OLPC -Mesh device operations, CORE = core daemon operations, DEVICE = activation and -general interface operations. +USER_SET, SYS_SET, SUSPEND, CORE, DEVICE, OLPC, WIMAX]. When "NONE" is given by +itself, logging is disabled. MB = Mobile Broadband, USER_SET = user settings +operations and communication, SYS_SET = system settings service operations, OLPC += OLPC Mesh device operations, CORE = core daemon operations, DEVICE = activation +and general interface operations. .SH "SEE ALSO" .BR http://live.gnome.org/NetworkManager/SystemSettings .sp diff --git a/src/logging/nm-logging.c b/src/logging/nm-logging.c index 5b5622fd70..01bbb36555 100644 --- a/src/logging/nm-logging.c +++ b/src/logging/nm-logging.c @@ -42,7 +42,8 @@ static guint32 log_domains = \ LOGD_HW | LOGD_RFKILL | LOGD_ETHER | LOGD_WIFI | LOGD_BT | LOGD_MB | \ LOGD_DHCP4 | LOGD_DHCP6 | LOGD_PPP | LOGD_IP4 | LOGD_IP6 | LOGD_AUTOIP4 | \ LOGD_DNS | LOGD_VPN | LOGD_SHARING | LOGD_SUPPLICANT | LOGD_USER_SET | \ - LOGD_SYS_SET | LOGD_SUSPEND | LOGD_CORE | LOGD_DEVICE | LOGD_OLPC_MESH; + LOGD_SYS_SET | LOGD_SUSPEND | LOGD_CORE | LOGD_DEVICE | LOGD_OLPC_MESH | \ + LOGD_WIMAX; typedef struct { guint32 num; @@ -82,6 +83,7 @@ static const LogDesc domain_descs[] = { { LOGD_CORE, "CORE" }, { LOGD_DEVICE, "DEVICE" }, { LOGD_OLPC_MESH, "OLPC" }, + { LOGD_WIMAX, "WIMAX" }, { 0, NULL } }; diff --git a/src/logging/nm-logging.h b/src/logging/nm-logging.h index e4abcf75ca..4bfc8078a0 100644 --- a/src/logging/nm-logging.h +++ b/src/logging/nm-logging.h @@ -51,6 +51,7 @@ enum { LOGD_CORE = 0x00100000, /* Core daemon and policy stuff */ LOGD_DEVICE = 0x00200000, /* Device state and activation */ LOGD_OLPC_MESH = 0x00400000, + LOGD_WIMAX = 0x00800000, }; #define LOGD_DHCP (LOGD_DHCP4 | LOGD_DHCP6)