aboutsummaryrefslogtreecommitdiff
path: root/clientloop.c
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2025-04-09 14:48:56 +0000
committerEd Maste <emaste@FreeBSD.org>2025-04-09 19:45:50 +0000
commit9792a032f0a99557271d6b7f7b0a955386c1fdbe (patch)
treefffe2fb734d6754ae63284d06db6bef8bb091a84 /clientloop.c
parentde47678f9822eb19289056cce942a43a29e28c06 (diff)
Diffstat (limited to 'clientloop.c')
-rw-r--r--clientloop.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/clientloop.c b/clientloop.c
index 8ed8b1c3449d..916fc077bdc9 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.408 2024/07/01 04:31:17 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.410 2024/12/03 22:30:03 jsg Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -659,9 +659,10 @@ obfuscate_keystroke_timing(struct ssh *ssh, struct timespec *timeout,
if (just_started)
return 1;
- /* Don't arm output fd for poll until the timing interval has elapsed */
+ /* Don't arm output fd for poll until the timing interval has elapsed... */
if (timespeccmp(&now, &next_interval, <))
- return 0;
+ /* ...unless there's x11 communication happening */
+ return x11_channel_used_recently(ssh);
/* Calculate number of intervals missed since the last check */
n = (now.tv_sec - next_interval.tv_sec) * 1000LL * 1000 * 1000;