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

wifi-utils: don't cache interface name

Browse Source 
For nl80211, we don't care about the interface name and only use it
when formatting error messages. For wext, an up-to-date interface name
should be obtained every time to minimize the chance of race
conditions when the interface is renamed.
This commit is contained in:
Beniamino Galvani
2017-03-20 22:50:21 +01:00
parent 7de4912ff0
commit 3860c2fbe3
8 changed files with 143 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,12 +38,11 @@
#include "platform/nm-platform-utils.h"
gpointer
wifi_data_new (const char *iface, int ifindex, gsize len)
wifi_data_new (int ifindex, gsize len)
{
WifiData *data;
data = g_malloc0 (len);
data->iface = g_strdup (iface);
data->ifindex = ifindex;
return data;
}
@@ -51,7 +50,6 @@ wifi_data_new (const char *iface, int ifindex, gsize len)
void
wifi_data_free (WifiData *data)
{
g_free (data->iface);
memset (data, 0, sizeof (*data));
g_free (data);
}
@@ -59,17 +57,16 @@ wifi_data_free (WifiData *data)
/*****************************************************************************/
WifiData *
wifi_utils_init (const char *iface, int ifindex, gboolean check_scan)
wifi_utils_init (int ifindex, gboolean check_scan)
{
WifiData *ret;
g_return_val_if_fail (iface != NULL, NULL);
g_return_val_if_fail (ifindex > 0, NULL);
ret = wifi_nl80211_init (iface, ifindex);
ret = wifi_nl80211_init (ifindex);
if (ret == NULL) {
#if HAVE_WEXT
ret = wifi_wext_init (iface, ifindex, check_scan);
ret = wifi_wext_init (ifindex, check_scan);
#endif
}
return ret;
@@ -83,14 +80,6 @@ wifi_utils_get_ifindex (WifiData *data)
return data->ifindex;
}
const char *
wifi_utils_get_iface (WifiData *data)
{
g_return_val_if_fail (data != NULL, NULL);
return data->iface;
}
NMDeviceWifiCapabilities
wifi_utils_get_caps (WifiData *data)
{