aboutsummaryrefslogtreecommitdiffstats
path: root/src/ap/ieee802_11.c
diff options
context:
space:
mode:
authorMichael Braun <michael-dev@fami-braun.de>2016-01-21 13:51:57 (GMT)
committerJouni Malinen <j@w1.fi>2016-02-17 09:46:13 (GMT)
commit8e44c192da28a2b8755d65df5d4963496da36c2a (patch)
tree7ffb70fafb894a2f3df0aae3f6e84830845fb899 /src/ap/ieee802_11.c
parent1889af2e0f89f9a98171761683eb1c244584daf8 (diff)
downloadhostap-8e44c192da28a2b8755d65df5d4963496da36c2a.zip
hostap-8e44c192da28a2b8755d65df5d4963496da36c2a.tar.gz
hostap-8e44c192da28a2b8755d65df5d4963496da36c2a.tar.bz2
radius: Add tagged VLAN parsing
1. Add tagged VLAN to struct vlan_description (compile limited number of tagged VLANs per description) For k tagged VLANs, the first k entries in vlan_description.tagged are used. They are sorted in ascending order. All other entries are zero. This way os_memcmp() can find identical configurations. 2. Let tagged VLANs be parsed from RADIUS Access-Accept 3. Print VLAN %d+ with %d=untagged VID if tagged VLANs are set 4. Select an unused vlan_id > 4096 for new tagged VLAN configurations 5. Add EGRESS_VLAN RADIUS attribute parsing also for untagged VLANs Signed-off-by: Michael Braun <michael-dev@fami-braun.de>
Diffstat (limited to 'src/ap/ieee802_11.c')
-rw-r--r--src/ap/ieee802_11.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
index b1d1660..0620fc4 100644
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -1101,8 +1101,9 @@ static void handle_auth(struct hostapd_data *hapd,
if (!hostapd_vlan_valid(hapd->conf->vlan, &vlan_id)) {
hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_RADIUS,
HOSTAPD_LEVEL_INFO,
- "Invalid VLAN %d received from RADIUS server",
- vlan_id.untagged);
+ "Invalid VLAN %d%s received from RADIUS server",
+ vlan_id.untagged,
+ vlan_id.tagged[0] ? "+" : "");
resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
goto fail;
}