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 <michael-dev@fami-braun.de>
diff --git a/src/ap/sta_info.h b/src/ap/sta_info.h
index 57551ab..d8d59cb 100644
--- a/src/ap/sta_info.h
+++ b/src/ap/sta_info.h
@@ -120,7 +120,7 @@
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 8d878a4..2c01b3f 100644
--- a/src/radius/radius.c
+++ b/src/radius/radius.c
@@ -1425,7 +1425,7 @@
/**
* 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 @@
return tun->vlanid;
}
- return -1;
+ return 0;
}
