Attachment 3541 Details for Bug 2573 – keep processing and buffering input during rekeying (by djm)

[patch] keep processing and buffering input during rekeying (by djm)

ssh-keep-processing-input-during-rekey.patch (text/plain), 1.52 KB, created by Darren Tucker on 2021-08-06 14:35:35 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2021-08-06 14:35:35 AEST

Size: 1.52 KB

patch

obsolete

>diff --git a/channels.c b/channels.c
>index fd72f371..db6c85bd 100644
>--- a/channels.c
>+++ b/channels.c
>@@ -2175,7 +2175,8 @@ channel_post_open(struct ssh *ssh, Channel *c,
> 	channel_handle_rfd(ssh, c, readset, writeset);
> 	channel_handle_wfd(ssh, c, readset, writeset);
> 	channel_handle_efd(ssh, c, readset, writeset);
>-	channel_check_window(ssh, c);
>+	if (!ssh_packet_is_rekeying(ssh))
>+		channel_check_window(ssh, c);
> }
> 
> static u_int
>@@ -2402,6 +2403,8 @@ channel_handler(struct ssh *ssh, int table,
> 		c = sc->channels[i];
> 		if (c == NULL)
> 			continue;
>+		if (ssh_packet_is_rekeying(ssh) && c->type != SSH_CHANNEL_OPEN)
>+			continue;
> 		if (c->delayed) {
> 			if (table == CHAN_PRE)
> 				c->delayed = 0;
>@@ -2485,9 +2488,7 @@ channel_prepare_select(struct ssh *ssh, fd_set **readsetp, fd_set **writesetp,
> 	memset(*readsetp, 0, sz);
> 	memset(*writesetp, 0, sz);
> 
>-	if (!ssh_packet_is_rekeying(ssh))
>-		channel_handler(ssh, CHAN_PRE, *readsetp, *writesetp,
>-		    minwait_secs);
>+	channel_handler(ssh, CHAN_PRE, *readsetp, *writesetp, minwait_secs);
> }
> 
> /*
>diff --git a/clientloop.c b/clientloop.c
>index bfcd50c2..843e5012 100644
>--- a/clientloop.c
>+++ b/clientloop.c
>@@ -1343,8 +1343,7 @@ client_loop(struct ssh *ssh, int have_pty, int escape_char_arg,
> 			break;
> 
> 		/* Do channel operations unless rekeying in progress. */
>-		if (!ssh_packet_is_rekeying(ssh))
>-			channel_after_select(ssh, readset, writeset);
>+		channel_after_select(ssh, readset, writeset);
> 
> 		/* Buffer input from the connection.  */
> 		client_process_net_input(ssh, readset);

Actions: View | Diff

Attachments on bug 2573: 3541