Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2025-02-20 02:53:03 -05:00
Code Issues Projects Releases Wiki Activity

hostapd: Support VLAN offload to the driver

Browse Source 
If the driver supports VLAN offload mechanism with a single netdev, use
that instead of separate per-VLAN netdevs.

Signed-off-by: Gurumoorthi Gnanasambandhan <gguru@codeaurora.org>
This commit is contained in:
Gurumoorthi Gnanasambandhan 2019-12-05 12:38:47 +02:00 committed by Jouni Malinen
parent 0f903f37dc
commit 99d8c4dca3
2 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ap/sta_info.c
View File

@ -1050,7 +1050,8 @@ int ap_sta_bind_vlan(struct hostapd_data *hapd, struct sta_info *sta)
if (sta->vlan_id == old_vlanid) if (sta->vlan_id == old_vlanid)
goto skip_counting; goto skip_counting;
if (sta->vlan_id > 0 && vlan == NULL) { if (sta->vlan_id > 0 && !vlan &&
!(hapd->iface->drv_flags & WPA_DRIVER_FLAGS_VLAN_OFFLOAD)) {
hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211, hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,
HOSTAPD_LEVEL_DEBUG, "could not find VLAN for " HOSTAPD_LEVEL_DEBUG, "could not find VLAN for "
"binding station to (vlan_id=%d)", "binding station to (vlan_id=%d)",

42
src/ap/wpa_auth_glue.c
View File

@ -385,8 +385,12 @@ static int hostapd_wpa_auth_set_key(void *ctx, int vlan_id, enum wpa_alg alg,
if (vlan_id > 0) { if (vlan_id > 0) {
ifname = hostapd_get_vlan_id_ifname(hapd->conf->vlan, vlan_id); ifname = hostapd_get_vlan_id_ifname(hapd->conf->vlan, vlan_id);
if (ifname == NULL) if (!ifname) {
return -1; if (!(hapd->iface->drv_flags &
WPA_DRIVER_FLAGS_VLAN_OFFLOAD))
return -1;
ifname = hapd->conf->iface;
}
} }
#ifdef CONFIG_TESTING_OPTIONS #ifdef CONFIG_TESTING_OPTIONS
@ -849,26 +853,32 @@ static int hostapd_wpa_auth_update_vlan(void *ctx, const u8 *addr, int vlan_id)
#ifndef CONFIG_NO_VLAN #ifndef CONFIG_NO_VLAN
struct hostapd_data *hapd = ctx; struct hostapd_data *hapd = ctx;
struct sta_info *sta; struct sta_info *sta;
struct vlan_description vlan_desc;
sta = ap_get_sta(hapd, addr); sta = ap_get_sta(hapd, addr);
if (!sta) if (!sta)
return -1; return -1;
os_memset(&vlan_desc, 0, sizeof(vlan_desc)); if (!(hapd->iface->drv_flags & WPA_DRIVER_FLAGS_VLAN_OFFLOAD)) {
vlan_desc.notempty = 1; struct vlan_description vlan_desc;
vlan_desc.untagged = vlan_id;
if (!hostapd_vlan_valid(hapd->conf->vlan, &vlan_desc)) {
wpa_printf(MSG_INFO, "Invalid VLAN ID %d in wpa_psk_file",
vlan_id);
return -1;
}
if (ap_sta_set_vlan(hapd, sta, &vlan_desc) < 0) { os_memset(&vlan_desc, 0, sizeof(vlan_desc));
wpa_printf(MSG_INFO, vlan_desc.notempty = 1;
"Failed to assign VLAN ID %d from wpa_psk_file to " vlan_desc.untagged = vlan_id;
MACSTR, vlan_id, MAC2STR(sta->addr)); if (!hostapd_vlan_valid(hapd->conf->vlan, &vlan_desc)) {
return -1; wpa_printf(MSG_INFO,
"Invalid VLAN ID %d in wpa_psk_file",
vlan_id);
return -1;
}
if (ap_sta_set_vlan(hapd, sta, &vlan_desc) < 0) {
wpa_printf(MSG_INFO,
"Failed to assign VLAN ID %d from wpa_psk_file to "
MACSTR, vlan_id, MAC2STR(sta->addr));
return -1;
}
} else {
sta->vlan_id = vlan_id;
} }
wpa_printf(MSG_INFO, wpa_printf(MSG_INFO,