public inbox for iwd@lists.linux.dev
 help / color / mirror / Atom feed
From: James Prestwood <prestwoj@gmail.com>
To: iwd@lists.linux.dev
Cc: James Prestwood <prestwoj@gmail.com>
Subject: [PATCH v2 04/11] station: update logic for handshake failure
Date: Thu, 18 Jul 2024 04:45:07 -0700	[thread overview]
Message-ID: <20240718114514.2916258-5-prestwoj@gmail.com> (raw)
In-Reply-To: <20240718114514.2916258-1-prestwoj@gmail.com>

After adding the NETDEV_RESULT_DISCONNECTED enum, handshake failures
initiated by the AP come in via this result so the existing logic
to call network_connect_failed() was broken. We could still get a
handshake failure generated internally, so that has been preserved
(via NETDEV_RESULT_HANDSHAKE_FAILED) but a check for a 4-way
handshake timeout reason code was also added.
---
 src/station.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/station.c b/src/station.c
index abbfc3dd..62b05c35 100644
--- a/src/station.c
+++ b/src/station.c
@@ -3368,7 +3368,13 @@ static void station_connect_cb(struct netdev *netdev, enum netdev_result result,
 	continue_autoconnect = station->state == STATION_STATE_CONNECTING_AUTO;
 
 	if (station->state == STATION_STATE_CONNECTING) {
-		bool during_eapol = result == NETDEV_RESULT_HANDSHAKE_FAILED;
+		/*
+		 * Either a handshake failure (generated internally) or a 4-way
+		 * handshake timeout should trigger the PSK to be asked for
+		 * again. Set during_eapol accordingly.
+		 */
+		bool during_eapol = result == NETDEV_RESULT_HANDSHAKE_FAILED ||
+			reason == MMPDU_REASON_CODE_4WAY_HANDSHAKE_TIMEOUT;
 		network_connect_failed(station->connected_network,
 								during_eapol);
 	}
-- 
2.34.1


  parent reply	other threads:[~2024-07-18 11:45 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-18 11:45 [PATCH v2 00/11] Refactor to unify connect failure code path James Prestwood
2024-07-18 11:45 ` [PATCH v2 01/11] station: print unknown channel number in neighbor report James Prestwood
2024-07-18 11:45 ` [PATCH v2 02/11] netdev: add NETDEV_RESULT_DISCONNECTED James Prestwood
2024-07-18 11:45 ` [PATCH v2 03/11] station: handle NETDEV_RESULT_DISCONNECTED James Prestwood
2024-07-18 11:45 ` James Prestwood [this message]
2024-07-18 11:45 ` [PATCH v2 05/11] netdev: handle disconnect event during a connection James Prestwood
2024-07-18 11:45 ` [PATCH v2 06/11] eapol: move HANDSHAKE_STARTED_EVENT to eapol_start() James Prestwood
2024-07-18 11:45 ` [PATCH v2 07/11] station: add handshake-started debug event James Prestwood
2024-07-18 11:45 ` [PATCH v2 08/11] auto-t: add clear_events() to IWD class James Prestwood
2024-07-18 11:45 ` [PATCH v2 09/11] auto-t: add reason/test arguments to hostapd deauthenticate James Prestwood
2024-07-18 11:45 ` [PATCH v2 10/11] auto-t: Add deauth during the 4-way handshake test James Prestwood
2024-07-18 11:45 ` [PATCH v2 11/11] auto-t: a few random autotest fixes James Prestwood
2024-07-18 21:11 ` [PATCH v2 00/11] Refactor to unify connect failure code path Denis Kenzior

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240718114514.2916258-5-prestwoj@gmail.com \
    --to=prestwoj@gmail.com \
    --cc=iwd@lists.linux.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox