View | Details | Raw Unified | Return to bug 2573
Collapse All | Expand All

(-)a/channels.c (-4 / +5 lines)
Lines 2175-2181 channel_post_open(struct ssh *ssh, Channel *c, Link Here
2175
	channel_handle_rfd(ssh, c, readset, writeset);
2175
	channel_handle_rfd(ssh, c, readset, writeset);
2176
	channel_handle_wfd(ssh, c, readset, writeset);
2176
	channel_handle_wfd(ssh, c, readset, writeset);
2177
	channel_handle_efd(ssh, c, readset, writeset);
2177
	channel_handle_efd(ssh, c, readset, writeset);
2178
	channel_check_window(ssh, c);
2178
	if (!ssh_packet_is_rekeying(ssh))
2179
		channel_check_window(ssh, c);
2179
}
2180
}
2180
2181
2181
static u_int
2182
static u_int
Lines 2402-2407 channel_handler(struct ssh *ssh, int table, Link Here
2402
		c = sc->channels[i];
2403
		c = sc->channels[i];
2403
		if (c == NULL)
2404
		if (c == NULL)
2404
			continue;
2405
			continue;
2406
		if (ssh_packet_is_rekeying(ssh) && c->type != SSH_CHANNEL_OPEN)
2407
			continue;
2405
		if (c->delayed) {
2408
		if (c->delayed) {
2406
			if (table == CHAN_PRE)
2409
			if (table == CHAN_PRE)
2407
				c->delayed = 0;
2410
				c->delayed = 0;
Lines 2485-2493 channel_prepare_select(struct ssh *ssh, fd_set **readsetp, fd_set **writesetp, Link Here
2485
	memset(*readsetp, 0, sz);
2488
	memset(*readsetp, 0, sz);
2486
	memset(*writesetp, 0, sz);
2489
	memset(*writesetp, 0, sz);
2487
2490
2488
	if (!ssh_packet_is_rekeying(ssh))
2491
	channel_handler(ssh, CHAN_PRE, *readsetp, *writesetp, minwait_secs);
2489
		channel_handler(ssh, CHAN_PRE, *readsetp, *writesetp,
2490
		    minwait_secs);
2491
}
2492
}
2492
2493
2493
/*
2494
/*
(-)a/clientloop.c (-2 / +1 lines)
Lines 1343-1350 client_loop(struct ssh *ssh, int have_pty, int escape_char_arg, Link Here
1343
			break;
1343
			break;
1344
1344
1345
		/* Do channel operations unless rekeying in progress. */
1345
		/* Do channel operations unless rekeying in progress. */
1346
		if (!ssh_packet_is_rekeying(ssh))
1346
		channel_after_select(ssh, readset, writeset);
1347
			channel_after_select(ssh, readset, writeset);
1348
1347
1349
		/* Buffer input from the connection.  */
1348
		/* Buffer input from the connection.  */
1350
		client_process_net_input(ssh, readset);
1349
		client_process_net_input(ssh, readset);

Return to bug 2573