[eapol] Delay EAPoL-Start while waiting for EAP to complete
EAP exchanges may take a long time to reach a final status, especially when relying upon MAC Authentication Bypass (MAB). Our current behaviour of sending EAPoL-Start every few seconds until a final status is obtained can prevent these exchanges from ever completing. Fix by redefining the EAP supplicant state to allow EAPoL-Start to be suppressed: either temporarily (while waiting for a full EAP exchange to complete, in which case we need to eventually resend EAPoL-Start if the final Success or Failure packet is lost), or permanently (while waiting for the potentially very long MAC Authentication Bypass timeout period). Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
+10
-5
@@ -47,6 +47,14 @@ static int eap_rx_request_identity ( struct eap_supplicant *supplicant ) {
|
||||
netdev->name );
|
||||
netdev_link_block ( netdev, EAP_BLOCK_TIMEOUT );
|
||||
|
||||
/* Mark EAP as in progress */
|
||||
supplicant->flags |= EAP_FL_ONGOING;
|
||||
|
||||
/* We have no identity to offer, so wait until the switch
|
||||
* times out and switches to MAC Authentication Bypass (MAB).
|
||||
*/
|
||||
supplicant->flags |= EAP_FL_PASSIVE;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -69,9 +77,6 @@ static int eap_rx_request ( struct eap_supplicant *supplicant,
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* Mark authentication as incomplete */
|
||||
supplicant->done = 0;
|
||||
|
||||
/* Handle according to type */
|
||||
switch ( req->type ) {
|
||||
case EAP_TYPE_IDENTITY:
|
||||
@@ -94,7 +99,7 @@ static int eap_rx_success ( struct eap_supplicant *supplicant ) {
|
||||
struct net_device *netdev = supplicant->netdev;
|
||||
|
||||
/* Mark authentication as complete */
|
||||
supplicant->done = 1;
|
||||
supplicant->flags = EAP_FL_PASSIVE;
|
||||
|
||||
/* Mark link as unblocked */
|
||||
DBGC ( netdev, "EAP %s Success\n", netdev->name );
|
||||
@@ -113,7 +118,7 @@ static int eap_rx_failure ( struct eap_supplicant *supplicant ) {
|
||||
struct net_device *netdev = supplicant->netdev;
|
||||
|
||||
/* Mark authentication as complete */
|
||||
supplicant->done = 1;
|
||||
supplicant->flags = EAP_FL_PASSIVE;
|
||||
|
||||
/* Record error */
|
||||
DBGC ( netdev, "EAP %s Failure\n", netdev->name );
|
||||
|
||||
Reference in New Issue
Block a user