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

core/logging: trivial renaming internal LOGD_OLPC_MESH name to LOGD_OLPC

Browse Source 
The domain LOGD_OLPC_MESH is known as "OLPC". This is the only case where
the internal name LOGD_X does not correspond to the external name X.

Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller
2014-05-12 18:51:52 +02:00
parent 4e8a91e6f8
commit 8e88b4e2fa
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/devices/nm-device-olpc-mesh.c
View File

@@ -128,12 +128,12 @@ constructor (GType type,
self = NM_DEVICE_OLPC_MESH (object); self = NM_DEVICE_OLPC_MESH (object);
nm_log_dbg (LOGD_HW | LOGD_OLPC_MESH, "(%s): kernel ifindex %d", nm_log_dbg (LOGD_HW | LOGD_OLPC, "(%s): kernel ifindex %d",
nm_device_get_iface (NM_DEVICE (self)), nm_device_get_iface (NM_DEVICE (self)),
nm_device_get_ifindex (NM_DEVICE (self))); nm_device_get_ifindex (NM_DEVICE (self)));
if (!nm_platform_wifi_get_capabilities (nm_device_get_ifindex (NM_DEVICE (self)), &caps)) { if (!nm_platform_wifi_get_capabilities (nm_device_get_ifindex (NM_DEVICE (self)), &caps)) {
nm_log_warn (LOGD_HW | LOGD_OLPC_MESH, "(%s): failed to initialize WiFi driver", nm_log_warn (LOGD_HW | LOGD_OLPC, "(%s): failed to initialize WiFi driver",
nm_device_get_iface (NM_DEVICE (self))); nm_device_get_iface (NM_DEVICE (self)));
g_object_unref (object); g_object_unref (object);
return NULL; return NULL;
@@ -244,14 +244,14 @@ act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
/* disconnect companion device, if it is connected */ /* disconnect companion device, if it is connected */
if (nm_device_get_act_request (NM_DEVICE (priv->companion))) { if (nm_device_get_act_request (NM_DEVICE (priv->companion))) {
nm_log_info (LOGD_OLPC_MESH, "(%s): disconnecting companion device %s", nm_log_info (LOGD_OLPC, "(%s): disconnecting companion device %s",
nm_device_get_iface (dev), nm_device_get_iface (dev),
nm_device_get_iface (priv->companion)); nm_device_get_iface (priv->companion));
/* FIXME: VPN stuff here is a bug; but we can't really change API now... */ /* FIXME: VPN stuff here is a bug; but we can't really change API now... */
nm_device_state_changed (NM_DEVICE (priv->companion), nm_device_state_changed (NM_DEVICE (priv->companion),
NM_DEVICE_STATE_DISCONNECTED, NM_DEVICE_STATE_DISCONNECTED,
NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED); NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED);
nm_log_info (LOGD_OLPC_MESH, "(%s): companion %s disconnected", nm_log_info (LOGD_OLPC, "(%s): companion %s disconnected",
nm_device_get_iface (dev), nm_device_get_iface (dev),
nm_device_get_iface (priv->companion)); nm_device_get_iface (priv->companion));
} }
@@ -478,7 +478,7 @@ companion_state_changed_cb (NMDeviceWifi *companion,
|| state > NM_DEVICE_STATE_ACTIVATED) || state > NM_DEVICE_STATE_ACTIVATED)
return; return;
nm_log_dbg (LOGD_OLPC_MESH, "(%s): disconnecting mesh due to companion connectivity", nm_log_dbg (LOGD_OLPC, "(%s): disconnecting mesh due to companion connectivity",
nm_device_get_iface (NM_DEVICE (self))); nm_device_get_iface (NM_DEVICE (self)));
/* FIXME: VPN stuff here is a bug; but we can't really change API now... */ /* FIXME: VPN stuff here is a bug; but we can't really change API now... */
nm_device_state_changed (NM_DEVICE (self), nm_device_state_changed (NM_DEVICE (self),
@@ -535,7 +535,7 @@ is_companion (NMDeviceOlpcMesh *self, NMDevice *other)
NM_DEVICE_STATE_DISCONNECTED, NM_DEVICE_STATE_DISCONNECTED,
NM_DEVICE_STATE_REASON_NONE); NM_DEVICE_STATE_REASON_NONE);
nm_log_info (LOGD_OLPC_MESH, "(%s): found companion WiFi device %s", nm_log_info (LOGD_OLPC, "(%s): found companion WiFi device %s",
nm_device_get_iface (NM_DEVICE (self)), nm_device_get_iface (NM_DEVICE (self)),
nm_device_get_iface (other)); nm_device_get_iface (other));

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

@@ -47,7 +47,7 @@ nm_log_handler (const gchar *log_domain,
LOGD_DHCP4 | LOGD_DHCP6 | LOGD_PPP | LOGD_WIFI_SCAN | LOGD_IP4 | \ LOGD_DHCP4 | LOGD_DHCP6 | LOGD_PPP | LOGD_WIFI_SCAN | LOGD_IP4 | \
LOGD_IP6 | LOGD_AUTOIP4 | LOGD_DNS | LOGD_VPN | LOGD_SHARING | \ LOGD_IP6 | LOGD_AUTOIP4 | LOGD_DNS | LOGD_VPN | LOGD_SHARING | \
LOGD_SUPPLICANT | LOGD_AGENTS | LOGD_SETTINGS | LOGD_SUSPEND | \ LOGD_SUPPLICANT | LOGD_AGENTS | LOGD_SETTINGS | LOGD_SUSPEND | \
LOGD_CORE | LOGD_DEVICE | LOGD_OLPC_MESH | LOGD_WIMAX | \ LOGD_CORE | LOGD_DEVICE | LOGD_OLPC | LOGD_WIMAX | \
LOGD_INFINIBAND | LOGD_FIREWALL | LOGD_ADSL | LOGD_BOND | \ LOGD_INFINIBAND | LOGD_FIREWALL | LOGD_ADSL | LOGD_BOND | \
LOGD_VLAN | LOGD_BRIDGE | LOGD_DBUS_PROPS | LOGD_TEAM | LOGD_CONCHECK | \ LOGD_VLAN | LOGD_BRIDGE | LOGD_DBUS_PROPS | LOGD_TEAM | LOGD_CONCHECK | \
LOGD_DCB | LOGD_DISPATCH) LOGD_DCB | LOGD_DISPATCH)
@@ -97,7 +97,7 @@ static const LogDesc domain_descs[] = {
{ LOGD_SUSPEND, "SUSPEND" }, { LOGD_SUSPEND, "SUSPEND" },
{ LOGD_CORE, "CORE" }, { LOGD_CORE, "CORE" },
{ LOGD_DEVICE, "DEVICE" }, { LOGD_DEVICE, "DEVICE" },
{ LOGD_OLPC_MESH, "OLPC" }, { LOGD_OLPC, "OLPC" },
{ LOGD_WIMAX, "WIMAX" }, { LOGD_WIMAX, "WIMAX" },
{ LOGD_INFINIBAND,"INFINIBAND" }, { LOGD_INFINIBAND,"INFINIBAND" },
{ LOGD_FIREWALL, "FIREWALL" }, { LOGD_FIREWALL, "FIREWALL" },

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

@@ -50,7 +50,7 @@ enum {
LOGD_SUSPEND = (1LL << 20), /* Suspend/Resume */ LOGD_SUSPEND = (1LL << 20), /* Suspend/Resume */
LOGD_CORE = (1LL << 21), /* Core daemon and policy stuff */ LOGD_CORE = (1LL << 21), /* Core daemon and policy stuff */
LOGD_DEVICE = (1LL << 22), /* Device state and activation */ LOGD_DEVICE = (1LL << 22), /* Device state and activation */
LOGD_OLPC_MESH = (1LL << 23), LOGD_OLPC = (1LL << 23),
LOGD_WIMAX = (1LL << 24), LOGD_WIMAX = (1LL << 24),
LOGD_INFINIBAND = (1LL << 25), LOGD_INFINIBAND = (1LL << 25),
LOGD_FIREWALL = (1LL << 26), LOGD_FIREWALL = (1LL << 26),

4
src/platform/wifi/wifi-utils-wext.c
View File

@@ -411,7 +411,7 @@ wifi_wext_set_mesh_channel (WifiData *data, guint32 channel)
} }
if (ioctl (wext->fd, SIOCSIWFREQ, &wrq) < 0) { if (ioctl (wext->fd, SIOCSIWFREQ, &wrq) < 0) {
nm_log_err (LOGD_HW | LOGD_WIFI | LOGD_OLPC_MESH, nm_log_err (LOGD_HW | LOGD_WIFI | LOGD_OLPC,
"(%s): error setting channel to %d: %s", "(%s): error setting channel to %d: %s",
wext->parent.iface, channel, strerror (errno)); wext->parent.iface, channel, strerror (errno));
return FALSE; return FALSE;
@@ -442,7 +442,7 @@ wifi_wext_set_mesh_ssid (WifiData *data, const GByteArray *ssid)
return TRUE; return TRUE;
if (errno != ENODEV) { if (errno != ENODEV) {
nm_log_err (LOGD_HW | LOGD_WIFI | LOGD_OLPC_MESH, nm_log_err (LOGD_HW | LOGD_WIFI | LOGD_OLPC,
"(%s): error setting SSID to '%s': %s", "(%s): error setting SSID to '%s': %s",
wext->parent.iface, wext->parent.iface,
ssid ? nm_utils_escape_ssid (ssid->data, ssid->len) : "(null)", ssid ? nm_utils_escape_ssid (ssid->data, ssid->len) : "(null)",