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

device/wifi: ensure consistent timestamp for dumping Wi-Fi AP

Browse source 
When we dump a list of APs, determine one timestamp for "now",
instead of re-evaluating it every time.

This ensures that all APs are printed with the same understanding
of the current timestamp.

(cherry picked from commit 5e4d13271c)
This commit is contained in:
Thomas Haller 2017-02-02 16:22:57 +01:00
parent 1272f3cc04
commit 023bceb41c
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/devices/wifi/nm-device-wifi.c
View file

@ -198,14 +198,15 @@ static void _hw_addr_set_scanning (NMDeviceWifi *self, gboolean do_reset);
static void static void
_ap_dump (NMDeviceWifi *self, _ap_dump (NMDeviceWifi *self,
const NMWifiAP *ap, const NMWifiAP *ap,
const char *prefix) const char *prefix,
gint32 now_s)
{ {
char buf[1024]; char buf[1024];
buf[0] = '\0'; buf[0] = '\0';
_LOGD (LOGD_WIFI_SCAN, "wifi-ap: %-7s %s", _LOGD (LOGD_WIFI_SCAN, "wifi-ap: %-7s %s",
prefix, prefix,
nm_wifi_ap_to_string (ap, buf, sizeof (buf))); nm_wifi_ap_to_string (ap, buf, sizeof (buf), now_s));
} }
static void static void
@ -1568,14 +1569,15 @@ ap_list_dump (gpointer user_data)
if (_LOGD_ENABLED (LOGD_WIFI_SCAN)) { if (_LOGD_ENABLED (LOGD_WIFI_SCAN)) {
gs_free NMWifiAP **list = NULL; gs_free NMWifiAP **list = NULL;
gsize i; gsize i;
gint32 now_s = nm_utils_get_monotonic_timestamp_s ();
_LOGD (LOGD_WIFI_SCAN, "APs: [now:%u last:%u next:%u]", _LOGD (LOGD_WIFI_SCAN, "APs: [now:%u last:%u next:%u]",
nm_utils_get_monotonic_timestamp_s (), now_s,
priv->last_scan, priv->last_scan,
priv->scheduled_scan_time); priv->scheduled_scan_time);
list = ap_list_get_sorted (self, TRUE); list = ap_list_get_sorted (self, TRUE);
for (i = 0; list[i]; i++) for (i = 0; list[i]; i++)
_ap_dump (self, list[i], "dump"); _ap_dump (self, list[i], "dump", now_s);
} }
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
@ -1673,10 +1675,10 @@ supplicant_iface_new_bss_cb (NMSupplicantInterface *iface,
found_ap = get_ap_by_supplicant_path (self, object_path); found_ap = get_ap_by_supplicant_path (self, object_path);
if (found_ap) { if (found_ap) {
_ap_dump (self, ap, "updated"); _ap_dump (self, ap, "updated", 0);
nm_wifi_ap_update_from_properties (found_ap, object_path, properties); nm_wifi_ap_update_from_properties (found_ap, object_path, properties);
} else { } else {
_ap_dump (self, ap, "added"); _ap_dump (self, ap, "added", 0);
ap_add_remove (self, ACCESS_POINT_ADDED, ap, TRUE); ap_add_remove (self, ACCESS_POINT_ADDED, ap, TRUE);
} }
@ -1711,7 +1713,7 @@ supplicant_iface_bss_updated_cb (NMSupplicantInterface *iface,
ap = get_ap_by_supplicant_path (self, object_path); ap = get_ap_by_supplicant_path (self, object_path);
if (ap) { if (ap) {
_ap_dump (self, ap, "updated"); _ap_dump (self, ap, "updated", 0);
nm_wifi_ap_update_from_properties (ap, object_path, properties); nm_wifi_ap_update_from_properties (ap, object_path, properties);
schedule_ap_list_dump (self); schedule_ap_list_dump (self);
} }
@ -1739,7 +1741,7 @@ supplicant_iface_bss_removed_cb (NMSupplicantInterface *iface,
*/ */
nm_wifi_ap_set_fake (ap, TRUE); nm_wifi_ap_set_fake (ap, TRUE);
} else { } else {
_ap_dump (self, ap, "removed"); _ap_dump (self, ap, "removed", 0);
ap_add_remove (self, ACCESS_POINT_REMOVED, ap, TRUE); ap_add_remove (self, ACCESS_POINT_REMOVED, ap, TRUE);
schedule_ap_list_dump (self); schedule_ap_list_dump (self);
} }

5
src/devices/wifi/nm-wifi-ap.c
View file

@ -578,7 +578,8 @@ add_group_ciphers (NMWifiAP *ap, NMSettingWirelessSecurity *sec)
const char * const char *
nm_wifi_ap_to_string (const NMWifiAP *self, nm_wifi_ap_to_string (const NMWifiAP *self,
char *str_buf, char *str_buf,
gulong buf_len) gulong buf_len,
gint32 now_s)
{ {
const NMWifiAPPrivate *priv; const NMWifiAPPrivate *priv;
const char *supplicant_id = "-"; const char *supplicant_id = "-";
@ -609,7 +610,7 @@ nm_wifi_ap_to_string (const NMWifiAP *self,
priv->flags & NM_802_11_AP_FLAGS_PRIVACY ? 'P' : '_', priv->flags & NM_802_11_AP_FLAGS_PRIVACY ? 'P' : '_',
priv->wpa_flags & 0xFFFF, priv->wpa_flags & 0xFFFF,
priv->rsn_flags & 0xFFFF, priv->rsn_flags & 0xFFFF,
priv->last_seen > 0 ? (nm_utils_get_monotonic_timestamp_s () - priv->last_seen) : -1, priv->last_seen > 0 ? ((now_s > 0 ? now_s : nm_utils_get_monotonic_timestamp_s ()) - priv->last_seen) : -1,
supplicant_id); supplicant_id);
return str_buf; return str_buf;
} }

3
src/devices/wifi/nm-wifi-ap.h
View file

@ -91,6 +91,7 @@ void nm_wifi_ap_set_fake (NMWifiAP *ap,
const char *nm_wifi_ap_to_string (const NMWifiAP *self, const char *nm_wifi_ap_to_string (const NMWifiAP *self,
char *str_buf, char *str_buf,
gulong buf_len); gulong buf_len,
gint32 now_s);
#endif /* __NM_WIFI_AP_H__ */ #endif /* __NM_WIFI_AP_H__ */