Skip to content

Commit

Permalink
wpa: use wpa debug tag instead of wireless
Browse files Browse the repository at this point in the history 
Replace ni_debug_wireless() with ni_debug_wpa() in wpa-supplicant.c.

Signed-off-by: Clemens Famulla-Conrad <cfamullaconrad@suse.de>
  • Loading branch information
@rtorrero @cfconrad
rtorrero authored and cfconrad committed May 31, 2021
1 parent 77707e2 commit 46bcfa8
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions src/wpa-supplicant.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ ni_wpa_interface_network_by_path(ni_wpa_interface_t *wpa_dev, const char *object
return NULL;
}
if (net_object->handle == NULL) {
ni_debug_wireless("new object %s", net_object->path);
ni_debug_wpa("new object %s", net_object->path);
ni_dbus_object_set_default_interface(net_object, NI_WPA_BSS_INTERFACE);

if (!(net_object->handle = ni_wireless_network_new())) {
Expand Down Expand Up @@ -269,7 +269,7 @@ ni_wpa_interface_bind(ni_wpa_client_t *wpa, ni_netdev_t *dev)
if (rv != -NI_ERROR_DEVICE_NOT_KNOWN)
goto failed;

ni_debug_wireless("%s: interface does not exist", dev->name);
ni_debug_wpa("%s: interface does not exist", dev->name);
rv = ni_wpa_add_interface(wpa, dev->name, dev->link.ifindex, &wpa_dev);
if (rv < 0)
goto failed;
Expand Down Expand Up @@ -768,7 +768,7 @@ ni_wpa_interface_associate(ni_wpa_interface_t *dev, ni_wireless_network_t *net,
{
ni_dbus_object_t *net_object;

ni_debug_wireless("%s(dev=%s, essid='%s')", __func__, dev->ifname,
ni_debug_wpa("%s(dev=%s, essid='%s')", __func__, dev->ifname,
ni_wireless_print_ssid(&net->essid));

/* FIXME: make sure we have all the keys/pass phrases etc to
Expand Down Expand Up @@ -853,12 +853,12 @@ ni_wpa_interface_state_change_event(ni_wpa_client_t *wpa,

wpa_dev = ni_wpa_client_interface_by_path(wpa, object_path);
if (wpa_dev == NULL) {
ni_debug_wireless("Ignore state change on untracked interface %s",
ni_debug_wpa("Ignore state change on untracked interface %s",
object_path);
return;
}

ni_debug_wireless("%s: state changed %s -> %s",
ni_debug_wpa("%s: state changed %s -> %s",
wpa_dev->ifname,
ni_wpa_ifstate_to_name(from_state),
ni_wpa_ifstate_to_name(to_state));
Expand Down Expand Up @@ -955,11 +955,11 @@ ni_wpa_interface_scan_results_available_event(ni_wpa_client_t *wpa, const char *

wpa_dev = ni_wpa_client_interface_by_path(wpa, object_path);
if (wpa_dev == NULL || wpa_dev->proxy == NULL) {
ni_debug_wireless("Ignore scan results on untracked interface %s", object_path);
ni_debug_wpa("Ignore scan results on untracked interface %s", object_path);
return;
}

ni_debug_wireless("%s: scan results available - retrieving them", wpa_dev->ifname);
ni_debug_wpa("%s: scan results available - retrieving them", wpa_dev->ifname);
ni_dbus_object_call_async(wpa_dev->proxy,
ni_wpa_interface_scan_results,
"scanResults",
Expand Down Expand Up @@ -1816,7 +1816,7 @@ ni_wpa_bss_properties_result(ni_dbus_object_t *proxy, ni_dbus_message_t *msg)
if (!ni_dbus_object_set_properties_from_dict(proxy, &ni_wpa_bssid_service, &dict, NULL))
goto failed;

ni_debug_wireless("Updated BSS %s, freq=%.3f GHz, quality=%.2f, noise=%u, level=%.2f dBm, maxrate=%u MB/s, essid='%s'",
ni_debug_wpa("Updated BSS %s, freq=%.3f GHz, quality=%.2f, noise=%u, level=%.2f dBm, maxrate=%u MB/s, essid='%s'",
ni_link_address_print(&net->access_point),
net->scan_info.frequency,
net->scan_info.quality,
Expand All @@ -1826,7 +1826,7 @@ ni_wpa_bss_properties_result(ni_dbus_object_t *proxy, ni_dbus_message_t *msg)
ni_wireless_print_ssid(&net->essid));

if (net->notified && memcmp(&old_essid, &net->essid, sizeof(old_essid)) != 0) {
ni_debug_wireless("%s: essid changed", ni_link_address_print(&net->access_point));
ni_debug_wpa("%s: essid changed", ni_link_address_print(&net->access_point));
net->notified = FALSE;
}
ni_timer_get_time(&net->scan_info.timestamp);
Expand Down Expand Up @@ -2384,13 +2384,13 @@ ni_wpa_interface_get_capabilities(ni_wpa_client_t *wpa, ni_wpa_interface_t *wpa_
if (rv) {
ni_wireless_interface_capabilities_t *caps = &wpa_dev->capabilities;

ni_debug_wireless("%s interface capabilities", wpa_dev->ifname);
ni_debug_wireless(" eap methods: %s", __ni_print_string_array(&caps->eap_methods));
ni_debug_wireless(" pairwise ciphers: %s", __ni_print_string_array(&caps->pairwise_ciphers));
ni_debug_wireless(" group ciphers: %s", __ni_print_string_array(&caps->group_ciphers));
ni_debug_wireless(" keymgmt: %s", __ni_print_string_array(&caps->keymgmt_algos));
ni_debug_wireless(" auth: %s", __ni_print_string_array(&caps->auth_algos));
ni_debug_wireless(" wpa protos: %s", __ni_print_string_array(&caps->wpa_protocols));
ni_debug_wpa("%s interface capabilities", wpa_dev->ifname);
ni_debug_wpa(" eap methods: %s", __ni_print_string_array(&caps->eap_methods));
ni_debug_wpa(" pairwise ciphers: %s", __ni_print_string_array(&caps->pairwise_ciphers));
ni_debug_wpa(" group ciphers: %s", __ni_print_string_array(&caps->group_ciphers));
ni_debug_wpa(" keymgmt: %s", __ni_print_string_array(&caps->keymgmt_algos));
ni_debug_wpa(" auth: %s", __ni_print_string_array(&caps->auth_algos));
ni_debug_wpa(" wpa protos: %s", __ni_print_string_array(&caps->wpa_protocols));
}
#endif

Expand Down Expand Up @@ -2443,6 +2443,6 @@ ni_wpa_signal(ni_dbus_connection_t *connection, ni_dbus_message_t *msg, void *us
if (!strcmp(member, "ScanResultsAvailable")) {
ni_wpa_interface_scan_results_available_event(wpa, dbus_message_get_path(msg));
} else {
ni_debug_wireless("%s signal received (not handled)", member);
ni_debug_wpa("%s signal received (not handled)", member);
}
}

0 comments on commit 46bcfa8

Please sign in to comment.