colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

logging: add WiMAX log domain

Browse Source
This commit is contained in:
Dan Williams
2011-01-02 22:16:22 -06:00
parent c28850ed52
commit 76c7d2f95c
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
man/NetworkManager.conf.5.in
View File

@@ -162,11 +162,11 @@ warning messages.
.B domains=\fI<domain1>,<domain2>, ...\fP .B domains=\fI<domain1>,<domain2>, ...\fP
The following log domains are available: [NONE, HW, RKILL, ETHER, WIFI, BT, MB, 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, 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, USER_SET, SYS_SET, SUSPEND, CORE, DEVICE, OLPC, WIMAX]. When "NONE" is given by
logging is disabled. MB = Mobile Broadband, USER_SET = user settings operations itself, logging is disabled. MB = Mobile Broadband, USER_SET = user settings
and communication, SYS_SET = system settings service operations, OLPC = OLPC operations and communication, SYS_SET = system settings service operations, OLPC
Mesh device operations, CORE = core daemon operations, DEVICE = activation and = OLPC Mesh device operations, CORE = core daemon operations, DEVICE = activation
general interface operations. and general interface operations.
.SH "SEE ALSO" .SH "SEE ALSO"
.BR http://live.gnome.org/NetworkManager/SystemSettings .BR http://live.gnome.org/NetworkManager/SystemSettings
.sp .sp

4
src/logging/nm-logging.c
View File

@@ -42,7 +42,8 @@ static guint32 log_domains = \
LOGD_HW | LOGD_RFKILL | LOGD_ETHER | LOGD_WIFI | LOGD_BT | LOGD_MB | \ 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_DHCP4 | LOGD_DHCP6 | LOGD_PPP | LOGD_IP4 | LOGD_IP6 | LOGD_AUTOIP4 | \
LOGD_DNS | LOGD_VPN | LOGD_SHARING | LOGD_SUPPLICANT | LOGD_USER_SET | \ 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 { typedef struct {
guint32 num; guint32 num;
@@ -82,6 +83,7 @@ static const LogDesc domain_descs[] = {
{ LOGD_CORE, "CORE" }, { LOGD_CORE, "CORE" },
{ LOGD_DEVICE, "DEVICE" }, { LOGD_DEVICE, "DEVICE" },
{ LOGD_OLPC_MESH, "OLPC" }, { LOGD_OLPC_MESH, "OLPC" },
{ LOGD_WIMAX, "WIMAX" },
{ 0, NULL } { 0, NULL }
}; };

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

@@ -51,6 +51,7 @@ enum {
LOGD_CORE = 0x00100000, /* Core daemon and policy stuff */ LOGD_CORE = 0x00100000, /* Core daemon and policy stuff */
LOGD_DEVICE = 0x00200000, /* Device state and activation */ LOGD_DEVICE = 0x00200000, /* Device state and activation */
LOGD_OLPC_MESH = 0x00400000, LOGD_OLPC_MESH = 0x00400000,
LOGD_WIMAX = 0x00800000,
}; };
#define LOGD_DHCP (LOGD_DHCP4 | LOGD_DHCP6) #define LOGD_DHCP (LOGD_DHCP4 | LOGD_DHCP6)