colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform: refactor nmp_utils_sysctl_open_netdir()

Browse Source 
- use nm_auto_close cleanup attribute
- optionally, return the found ifname
- don't stat "phy80211". If such an entity can be opened,
  just assume it's a directory.
This commit is contained in:
Thomas Haller
2016-12-08 13:55:17 +01:00
parent b95556eb78
commit 76876e896c
3 changed files with 77 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/platform/wifi/wifi-utils.c
View File

@@ -187,29 +187,26 @@ wifi_utils_is_wifi (int ifindex, const char *ifname)
{
int fd_sysnet;
int fd_phy80211;
struct stat s;
char ifname_verified[IFNAMSIZ];
g_return_val_if_fail (ifname != NULL, FALSE);
g_return_val_if_fail (ifindex > 0, FALSE);
fd_sysnet = nmp_utils_open_sysctl (ifindex, ifname);
fd_sysnet = nmp_utils_sysctl_open_netdir (ifindex, ifname, ifname_verified);
if (fd_sysnet < 0)
return FALSE;
fd_phy80211 = openat (fd_sysnet, "phy80211", 0);
if (fd_phy80211 < 0) {
close (fd_sysnet);
return FALSE;
}
/* there might have been a race and ifname might be wrong. Below for checking
* wext, use the possibly improved name that we just verified. */
ifname = ifname_verified;
if ((fstat (fd_phy80211, &s) == 0 && (s.st_mode & S_IFDIR))) {
close (fd_sysnet);
fd_phy80211 = openat (fd_sysnet, "phy80211", O_CLOEXEC);
close (fd_sysnet);
if (fd_phy80211 >= 0) {
close (fd_phy80211);
return TRUE;
}
close (fd_sysnet);
close (fd_phy80211);
#if HAVE_WEXT
if (wifi_wext_is_wifi (ifname))
return TRUE;