From 3ffdeb7ac8e8efdfaadddbd890de49ce3e7cc956 Mon Sep 17 00:00:00 2001 From: Michael Braun Date: Fri, 10 Apr 2015 14:49:46 +0200 Subject: [PATCH] Fix RSN preauthentication with dynamic_vlan enabled but unused sta->vlan_id == -1 means no VLAN, as does vlan_id = 0. Signed-off-by: Michael Braun --- src/ap/sta_info.h | 2 +- src/radius/radius.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ap/sta_info.h b/src/ap/sta_info.h index 57551ab17..d8d59cb0c 100644 --- a/src/ap/sta_info.h +++ b/src/ap/sta_info.h @@ -120,7 +120,7 @@ struct sta_info { struct hostapd_ssid *ssid; /* SSID selection based on (Re)AssocReq */ struct hostapd_ssid *ssid_probe; /* SSID selection based on ProbeReq */ - int vlan_id; + int vlan_id; /* 0: none, >0: VID */ /* PSKs from RADIUS authentication server */ struct hostapd_sta_wpa_psk_short *psk; diff --git a/src/radius/radius.c b/src/radius/radius.c index 8d878a4bd..2c01b3f9d 100644 --- a/src/radius/radius.c +++ b/src/radius/radius.c @@ -1425,7 +1425,7 @@ struct radius_tunnel_attrs { /** * radius_msg_get_vlanid - Parse RADIUS attributes for VLAN tunnel information * @msg: RADIUS message - * Returns: VLAN ID for the first tunnel configuration of -1 if none is found + * Returns: VLAN ID for the first tunnel configuration or 0 if none is found */ int radius_msg_get_vlanid(struct radius_msg *msg) { @@ -1488,7 +1488,7 @@ int radius_msg_get_vlanid(struct radius_msg *msg) return tun->vlanid; } - return -1; + return 0; }