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

2007-08-20 Dan Williams <dcbw@redhat.com>

Browse source 
* 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
This commit is contained in:
Dan Williams 2007-08-21 01:41:04 +00:00
parent 7823115115
commit 3c14aa3926
4 changed files with 44 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2007-08-20 Dan Williams <dcbw@redhat.com>
* 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 <dcbw@redhat.com>
* src/nm-device-802-3-ethernet.c

30
src/NetworkManagerAP.c
View file

@ -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)
{

2
src/NetworkManagerAP.h
View file

@ -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

37
src/NetworkManagerAPList.c
View file

@ -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);
}