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

2008-01-31 Dan Williams <dcbw@redhat.com>

Browse source 
* src/nm-device-802-11-wireless.h
	  src/nm-device-802-11-wireless.c
		- (ap_list_get_ap_by_ssid, is_associated,
		   nm_device_802_11_wireless_ap_list_get_ap_by_ssid,
		   nm_device_802_11_wireless_ap_list_get_ap_by_obj_path): remove
		- (nm_device_802_11_wireless_get_activation_ap): collapse
			nm_device_802_11_wireless_ap_list_get_ap_by_obj_path() into this
			function



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3282 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-01-31 23:46:12 +00:00
parent 1320f3148b
commit 25a0d4d9d9
3 changed files with 20 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2008-01-31 Dan Williams <dcbw@redhat.com>
* src/nm-device-802-11-wireless.h
src/nm-device-802-11-wireless.c
- (ap_list_get_ap_by_ssid, is_associated,
nm_device_802_11_wireless_ap_list_get_ap_by_ssid,
nm_device_802_11_wireless_ap_list_get_ap_by_obj_path): remove
- (nm_device_802_11_wireless_get_activation_ap): collapse
nm_device_802_11_wireless_ap_list_get_ap_by_obj_path() into this
function
2008-01-30 Dan Williams <dcbw@redhat.com>
* system-settings/plugins/ifcfg

121
src/nm-device-802-11-wireless.c
View file

@ -904,23 +904,6 @@ nm_device_802_11_wireless_get_address (NMDevice80211Wireless *self,
memcpy (addr, &(self->priv->hw_addr), sizeof (struct ether_addr));
}
static NMAccessPoint *
ap_list_get_ap_by_ssid (GSList *list,
const GByteArray * ssid)
{
GSList * elt;
for (elt = list; elt; elt = g_slist_next (elt)) {
NMAccessPoint * ap = NM_AP (elt->data);
const GByteArray * ap_ssid = nm_ap_get_ssid (ap);
if (ap_ssid && nm_utils_same_ssid (ap_ssid, ssid, TRUE))
return ap;
}
return NULL;
}
#if DEBUG
static void
nm_device_802_11_wireless_ap_list_print (NMDevice80211Wireless *self)
@ -939,46 +922,6 @@ nm_device_802_11_wireless_ap_list_print (NMDevice80211Wireless *self)
}
#endif
/*
* nm_device_802_11_wireless_ap_list_get_ap_by_ssid
*
* Get the access point for a specific SSID
*
*/
NMAccessPoint *
nm_device_802_11_wireless_ap_list_get_ap_by_ssid (NMDevice80211Wireless *self,
const GByteArray * ssid)
{
g_return_val_if_fail (self != NULL, NULL);
g_return_val_if_fail (ssid != NULL, NULL);
return ap_list_get_ap_by_ssid (self->priv->ap_list, ssid);
}
/*
* nm_device_ap_list_get_ap_by_obj_path
*
* Get the access point for a dbus object path. Requires an _unescaped_
* object path.
*
*/
NMAccessPoint *
nm_device_802_11_wireless_ap_list_get_ap_by_obj_path (NMDevice80211Wireless *self,
const char *obj_path)
{
GSList * elt;
for (elt = self->priv->ap_list; elt; elt = g_slist_next (elt)) {
NMAccessPoint *ap = NM_AP (elt->data);
if (!strcmp (obj_path, nm_ap_get_dbus_path (ap)))
return ap;
}
return NULL;
}
static gboolean
impl_device_get_access_points (NMDevice80211Wireless *self,
GPtrArray **aps,
@ -1587,60 +1530,6 @@ cancel_pending_scan (NMDevice80211Wireless *self)
}
#if 0
/*
* is_associated
*
* Figure out whether or not we're associated to an access point
*/
static gboolean
is_associated (NMDevice80211Wireless *self)
{
struct iwreq wrq;
NMSock * sk;
gboolean associated = FALSE;
const char * iface;
iface = nm_device_get_iface (NM_DEVICE (self));
if ((sk = nm_dev_sock_open (iface, DEV_WIRELESS, __FUNCTION__, NULL)) == NULL)
return FALSE;
/* Some cards, for example ipw2x00 cards, can short-circuit the MAC
* address check using this check on IWNAME. Its faster.
*/
memset (&wrq, 0, sizeof (struct iwreq));
nm_ioctl_info ("%s: About to GET IWNAME.", iface);
if (iw_get_ext (nm_dev_sock_get_fd (sk), iface, SIOCGIWNAME, &wrq) >= 0)
{
if (!strcmp (wrq.u.name, "unassociated"))
{
associated = FALSE;
goto out;
}
}
if (!associated)
{
/*
* For all other wireless cards, the best indicator of a "link" at this time
* seems to be whether the card has a valid access point MAC address.
* Is there a better way? Some cards don't work too well with this check, ie
* Lucent WaveLAN.
*/
nm_ioctl_info ("%s: About to GET IWAP.", iface);
if (iw_get_ext (nm_dev_sock_get_fd (sk), iface, SIOCGIWAP, &wrq) >= 0)
if (nm_ethernet_address_is_valid ((struct ether_addr *)(&(wrq.u.ap_addr.sa_data))))
associated = TRUE;
}
out:
nm_dev_sock_close (sk);
return associated;
}
#endif
static gboolean
is_encrypted (guint32 flags, guint32 wpa_flags, guint32 rsn_flags)
{
@ -3246,6 +3135,7 @@ nm_device_802_11_wireless_get_activation_ap (NMDevice80211Wireless *self)
{
NMActRequest *req;
const char *ap_path;
GSList * elt;
g_return_val_if_fail (NM_IS_DEVICE_802_11_WIRELESS (self), NULL);
@ -3257,6 +3147,13 @@ nm_device_802_11_wireless_get_activation_ap (NMDevice80211Wireless *self)
if (!ap_path)
return NULL;
return nm_device_802_11_wireless_ap_list_get_ap_by_obj_path (self, ap_path);
/* Find the AP by it's object path */
for (elt = self->priv->ap_list; elt; elt = g_slist_next (elt)) {
NMAccessPoint *ap = NM_AP (elt->data);
if (!strcmp (ap_path, nm_ap_get_dbus_path (ap)))
return ap;
}
return NULL;
}

6
src/nm-device-802-11-wireless.h
View file

@ -100,12 +100,6 @@ gboolean nm_device_802_11_wireless_set_mode (NMDevice80211Wireless *self,
void nm_device_802_11_wireless_reset_scan_interval (NMDevice80211Wireless *dev);
NMAccessPoint * nm_device_802_11_wireless_ap_list_get_ap_by_obj_path (NMDevice80211Wireless *dev,
const char *obj_path);
NMAccessPoint * nm_device_802_11_wireless_ap_list_get_ap_by_ssid (NMDevice80211Wireless *dev,
const GByteArray * ssid);
int nm_device_802_11_wireless_get_mode (NMDevice80211Wireless *self);
gboolean nm_device_802_11_wireless_can_activate (NMDevice80211Wireless * self);