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

Style fixes and cleanups

Browse source 
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2998 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2007-10-22 17:41:17 +00:00
parent c94068eb71
commit 308836fb6f
1 changed files with 33 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -947,35 +947,29 @@ nm_device_802_11_wireless_reset_scan_interval (NMDevice80211Wireless *self)
int int
nm_device_802_11_wireless_get_mode (NMDevice80211Wireless *self) nm_device_802_11_wireless_get_mode (NMDevice80211Wireless *self)
{ {
NMSock * sk; NMSock *sk;
int mode = IW_MODE_AUTO; int mode = IW_MODE_AUTO;
const char *iface; const char *iface;
struct iwreq wrq;
g_return_val_if_fail (self != NULL, -1); g_return_val_if_fail (self != NULL, -1);
iface = nm_device_get_iface (NM_DEVICE (self)); iface = nm_device_get_iface (NM_DEVICE (self));
sk = nm_dev_sock_open (iface, DEV_WIRELESS, __FUNCTION__, NULL);
if (!sk)
goto out;
/* Force the card into Managed/Infrastructure mode */ memset (&wrq, 0, sizeof (struct iwreq));
if ((sk = nm_dev_sock_open (iface, DEV_WIRELESS, __FUNCTION__, NULL)))
{
struct iwreq wrq;
memset (&wrq, 0, sizeof (struct iwreq)); nm_ioctl_info ("%s: About to GET IWMODE.", iface);
if (iw_get_ext (nm_dev_sock_get_fd (sk), iface, SIOCGIWMODE, &wrq) == 0) {
nm_ioctl_info ("%s: About to GET IWMODE.", iface); if ((mode == IW_MODE_ADHOC) || (mode == IW_MODE_INFRA))
mode = wrq.u.mode;
if (iw_get_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (NM_DEVICE (self)), SIOCGIWMODE, &wrq) == 0) } else
{ nm_warning ("error getting card mode on %s: %s", iface, strerror (errno));
if ((mode == IW_MODE_ADHOC) || (mode == IW_MODE_INFRA)) nm_dev_sock_close (sk);
mode = wrq.u.mode;
}
else
{
nm_warning ("error getting card mode on %s: %s", iface, strerror (errno));
}
nm_dev_sock_close (sk);
}
out:
return mode; return mode;
} }
@ -990,9 +984,10 @@ gboolean
nm_device_802_11_wireless_set_mode (NMDevice80211Wireless *self, nm_device_802_11_wireless_set_mode (NMDevice80211Wireless *self,
const int mode) const int mode)
{ {
NMSock * sk; NMSock *sk;
const char *iface; const char *iface;
gboolean success = FALSE; gboolean success = FALSE;
struct iwreq wrq;
g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (self != NULL, FALSE);
g_return_val_if_fail ((mode == IW_MODE_INFRA) || (mode == IW_MODE_ADHOC) || (mode == IW_MODE_AUTO), FALSE); g_return_val_if_fail ((mode == IW_MODE_INFRA) || (mode == IW_MODE_ADHOC) || (mode == IW_MODE_AUTO), FALSE);
@ -1002,31 +997,26 @@ nm_device_802_11_wireless_set_mode (NMDevice80211Wireless *self,
iface = nm_device_get_iface (NM_DEVICE (self)); iface = nm_device_get_iface (NM_DEVICE (self));
/* Force the card into Managed/Infrastructure mode */ sk = nm_dev_sock_open (iface, DEV_WIRELESS, __FUNCTION__, NULL);
if ((sk = nm_dev_sock_open (iface, DEV_WIRELESS, __FUNCTION__, NULL))) if (!sk)
{ goto out;
struct iwreq wreq;
nm_ioctl_info ("%s: About to SET IWMODE.", iface); nm_ioctl_info ("%s: About to SET IWMODE.", iface);
wreq.u.mode = mode; memset (&wrq, 0, sizeof (struct iwreq));
if (iw_set_ext (nm_dev_sock_get_fd (sk), iface, SIOCSIWMODE, &wreq) == 0) wrq.u.mode = mode;
success = TRUE;
else if (iw_set_ext (nm_dev_sock_get_fd (sk), iface, SIOCSIWMODE, &wrq) == 0)
{ success = TRUE;
if (errno != ENODEV) else {
{ if (errno != ENODEV) {
nm_warning ("error setting card %s to %s mode: %s", nm_warning ("error setting card %s to mode %d: %s",
iface, iface, mode, strerror (errno));
mode == IW_MODE_INFRA ? "Infrastructure" : \
(mode == IW_MODE_ADHOC ? "Ad-Hoc" : \
(mode == IW_MODE_AUTO ? "Auto" : "unknown")),
strerror (errno));
}
} }
nm_dev_sock_close (sk);
} }
nm_dev_sock_close (sk);
out:
return success; return success;
} }