Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-12-30 14:22:37 +01:00
Code Releases Activity

wiphy: Add wiphy_generate_random_address

Browse Source
This commit is contained in:
Denis Kenzior 2019-07-01 18:28:26 -05:00
parent f72d9c2999
commit f4402ef56e
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/wiphy.c
View File

@ -54,6 +54,7 @@ static struct l_genl_family *nl80211 = NULL;
static struct l_hwdb *hwdb; static struct l_hwdb *hwdb;
static char **whitelist_filter; static char **whitelist_filter;
static char **blacklist_filter; static char **blacklist_filter;
static int mac_randomize_bytes = 6;
struct wiphy { struct wiphy {
uint32_t id; uint32_t id;
@ -353,6 +354,35 @@ const uint8_t *wiphy_get_permanent_address(struct wiphy *wiphy)
return wiphy->permanent_addr; return wiphy->permanent_addr;
} }
void wiphy_generate_random_address(struct wiphy *wiphy, uint8_t addr[static 6])
{
switch (mac_randomize_bytes) {
case 6:
l_getrandom(addr, 6);
/* Set the locally administered bit */
addr[0] |= 0x2;
/* Reset multicast bit */
addr[0] &= 0xfe;
break;
case 3:
l_getrandom(addr + 3, 3);
memcpy(addr, wiphy->permanent_addr, 3);
break;
}
/*
* Constrain the last NIC byte to 0x00 .. 0xfe, otherwise we might be
* able to generate an address of 0xff 0xff 0xff which might be
* interpreted as a vendor broadcast. Similarly, 0x00 0x00 0x00 is
* also not valid
*/
addr[5] &= 0xfe;
if (util_mem_is_zero(addr + 3, 3))
addr[5] = 0x01;
}
bool wiphy_constrain_freq_set(const struct wiphy *wiphy, bool wiphy_constrain_freq_set(const struct wiphy *wiphy,
struct scan_freq_set *set) struct scan_freq_set *set)
{ {
@ -1037,6 +1067,13 @@ static void setup_wiphy_interface(struct l_dbus_interface *interface)
bool wiphy_init(struct l_genl_family *in, const char *whitelist, bool wiphy_init(struct l_genl_family *in, const char *whitelist,
const char *blacklist) const char *blacklist)
{ {
const struct l_settings *config = iwd_get_config();
const char *s = l_settings_get_value(config, "General",
"mac_randomize_bytes");
if (s && !strcmp(s, "nic"))
mac_randomize_bytes = 3;
/* /*
* This is an extra sanity check so that no memory is leaked * This is an extra sanity check so that no memory is leaked
* in case the generic netlink handling gets confused. * in case the generic netlink handling gets confused.
@ -1079,6 +1116,7 @@ bool wiphy_exit(void)
wiphy_list = NULL; wiphy_list = NULL;
nl80211 = NULL; nl80211 = NULL;
mac_randomize_bytes = 6;
l_dbus_unregister_interface(dbus_get_bus(), IWD_WIPHY_INTERFACE); l_dbus_unregister_interface(dbus_get_bus(), IWD_WIPHY_INTERFACE);

2
src/wiphy.h
View File

@ -72,6 +72,8 @@ const char *wiphy_get_driver(struct wiphy *wiphy);
const char *wiphy_get_name(struct wiphy *wiphy); const char *wiphy_get_name(struct wiphy *wiphy);
const uint8_t *wiphy_get_permanent_address(struct wiphy *wiphy); const uint8_t *wiphy_get_permanent_address(struct wiphy *wiphy);
void wiphy_generate_random_address(struct wiphy *wiphy, uint8_t addr[static 6]);
uint32_t wiphy_state_watch_add(struct wiphy *wiphy, uint32_t wiphy_state_watch_add(struct wiphy *wiphy,
wiphy_state_watch_func_t func, void *user_data, wiphy_state_watch_func_t func, void *user_data,
wiphy_destroy_func_t destroy); wiphy_destroy_func_t destroy);