From 3c14aa392613cf7a441d2fa7074eb04e0685585a Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 21 Aug 2007 01:41:04 +0000 Subject: [PATCH] 2007-08-20 Dan Williams * src/NetworkManagerAP.c * src/NetworkManagerAP.h - (nm_ap_print_self): new function * src/NetworkManagerAPList.c - (nm_ap_list_print_members): call nm_ap_print_self() rather than trying to do it all here git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2715 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 10 ++++++++++ src/NetworkManagerAP.c | 30 ++++++++++++++++++++++++++++++ src/NetworkManagerAP.h | 2 ++ src/NetworkManagerAPList.c | 37 ++----------------------------------- 4 files changed, 44 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index dfec5ee380..ad4fa34b3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-08-20 Dan Williams + + * src/NetworkManagerAP.c + * src/NetworkManagerAP.h + - (nm_ap_print_self): new function + + * src/NetworkManagerAPList.c + - (nm_ap_list_print_members): call nm_ap_print_self() rather than trying + to do it all here + 2007-08-17 Dan Williams * src/nm-device-802-3-ethernet.c diff --git a/src/NetworkManagerAP.c b/src/NetworkManagerAP.c index a27b2f83c4..8b58134b6e 100644 --- a/src/NetworkManagerAP.c +++ b/src/NetworkManagerAP.c @@ -518,6 +518,36 @@ nm_ap_new_from_properties (GHashTable *properties) return ap; } +#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x" +#define MAC_ARG(x) ((guint8*)(x))[0],((guint8*)(x))[1],((guint8*)(x))[2],((guint8*)(x))[3],((guint8*)(x))[4],((guint8*)(x))[5] + +void +nm_ap_print_self (NMAccessPoint *ap, + const char * prefix) +{ + NMAccessPointPrivate *priv; + + g_return_if_fail (NM_IS_AP (ap)); + + priv = NM_AP_GET_PRIVATE (ap); + + nm_info ("%s'%s' (%p) stamp=%ld caps=0x%X bssid=" MAC_FMT " strength=%d " + "freq=[%f/%d] rate=%d inval=%d mode=%d seen=%ld", + prefix, + priv->ssid ? nm_utils_escape_ssid (priv->ssid->data, priv->ssid->len) : "(none)", + ap, + priv->timestamp.tv_sec, + priv->capabilities, + MAC_ARG (priv->address.ether_addr_octet), + priv->strength, + (priv->freq > 20) ? priv->freq : 0, + (priv->freq < 20) ? (int) priv->freq : 0, + priv->rate, + priv->invalid, + priv->mode, + priv->last_seen); +} + const char * nm_ap_get_dbus_path (NMAccessPoint *ap) { diff --git a/src/NetworkManagerAP.h b/src/NetworkManagerAP.h index 73d8860e49..64fda566ff 100644 --- a/src/NetworkManagerAP.h +++ b/src/NetworkManagerAP.h @@ -118,6 +118,8 @@ void nm_ap_add_capabilities_from_security (NMAccessPoint *ap, NMAPSecurity *s void nm_ap_add_capabilities_from_ie (NMAccessPoint *ap, const guint8 *wpa_ie, guint32 length); void nm_ap_add_capabilities_for_wep (NMAccessPoint *ap); +void nm_ap_print_self (NMAccessPoint *ap, const char * prefix); + /* * NOTE: * This is not intended to return true for all APs with manufacturer defaults. It is intended to return true for diff --git a/src/NetworkManagerAPList.c b/src/NetworkManagerAPList.c index ccd83f62df..8e431022b8 100644 --- a/src/NetworkManagerAPList.c +++ b/src/NetworkManagerAPList.c @@ -503,9 +503,6 @@ void nm_ap_list_iter_free (NMAPListIter *iter) } -#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x" -#define MAC_ARG(x) ((guint8*)(x))[0],((guint8*)(x))[1],((guint8*)(x))[2],((guint8*)(x))[3],((guint8*)(x))[4],((guint8*)(x))[5] - /* * nm_ap_list_print_members * @@ -525,38 +522,8 @@ void nm_ap_list_print_members (NMAccessPointList *list, const char *name) return; nm_info ("AP_LIST_PRINT: printing members of '%s'", name); - while ((ap = nm_ap_list_iter_next (iter))) { - const GTimeVal * timestamp = nm_ap_get_timestamp (ap); - const glong seen = nm_ap_get_last_seen (ap); - NMAPSecurity * security = nm_ap_get_security (ap); - const char * key = ""; - const struct ether_addr * eth_addr = nm_ap_get_address (ap); - char addr[ETH_ALEN]; - double freq = nm_ap_get_freq (ap); - const GByteArray * ssid = nm_ap_get_ssid (ap); - - if (security) - key = nm_ap_security_get_key (security); - - memcpy (&addr, eth_addr, ETH_ALEN); - - nm_info ("%d)\t'%s' (%p) stamp=%ld enc=%d addr=" MAC_FMT " strength=%d " - "freq=[%f/%d] rate=%d inval=%d mode=%d seen=%ld", - i, - ssid ? nm_utils_escape_ssid (ssid->data, ssid->len) : "(none)", - ap, - timestamp->tv_sec, - nm_ap_get_encrypted (ap), - MAC_ARG (addr), - nm_ap_get_strength (ap), - (freq > 20) ? freq : 0, - (freq < 20) ? (int) freq : 0, - nm_ap_get_rate (ap), - nm_ap_get_invalid (ap), - nm_ap_get_mode (ap), - seen); - i++; - } + while ((ap = nm_ap_list_iter_next (iter))) + nm_ap_print_self (ap, "::\t"); nm_info ("AP_LIST_PRINT: done"); nm_ap_list_iter_free (iter); }