chap: only cause timeout if actually waiting for something

1 files changed, 5 insertions, 3 deletions

diff --git a/src/chap.rs b/src/chap.rs
index 4a31876..1fbc80e 100644
--- a/src/chap.rs
+++ b/src/chap.rs
@@ -85,9 +85,11 @@ impl ChapClient {
     /// Waits for and returns the next packet to send.
     pub async fn to_send(&mut self) -> ChapPacket {
         tokio::select! {
-        packet = self.output_rx.recv() => packet.expect("output channel is closed"),
-        _ = self.timeout.tick() => self.fail(),
-            }
+            packet = self.output_rx.recv() => packet.expect("output channel is closed"),
+            _ = self.timeout.tick(), if self.state == ChapClientState::Waiting
+                || self.state == ChapClientState::ResponseSent
+                || self.state == ChapClientState::ReauthSent => self.fail(),
+        }
     }
 
     /// Feeds a packet into the state machine for processing.