Mercurial > dropbear

diff cli-chansession.c @ 1829:a7cc3332d8ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace ChanType.sepfds with Channel.bidir_fd This handles the case where a svrchansess has separate FDs for nopty, but a single FD for pty mode. The use of sepfds was also previously incorrect for X11 and agent forwarding
author Matt Johnston <matt@ucc.asn.au>
date Mon, 11 Oct 2021 15:42:14 +0800
parents 4b01f4826a29
children 1d86a58fb52d
line wrap: on
line diff
--- a/cli-chansession.c	Mon Oct 11 15:16:54 2021 +0800
+++ b/cli-chansession.c	Mon Oct 11 15:42:14 2021 +0800
@@ -46,7 +46,6 @@
 static void cli_tty_setup(void);
 
 const struct ChanType clichansess = {
-	0, /* sepfds */
 	"session", /* name */
 	cli_initchansess, /* inithandler */
 	NULL, /* checkclosehandler */
@@ -344,6 +343,7 @@
 	setnonblocking(STDERR_FILENO);
 
 	channel->extrabuf = cbuf_new(opts.recv_window);
+	channel->bidir_fd = 0;
 	return 0;
 }
 
@@ -383,7 +383,6 @@
 #if DROPBEAR_CLI_NETCAT
 
 static const struct ChanType cli_chan_netcat = {
-	0, /* sepfds */
 	"direct-tcpip",
 	cli_init_netcat, /* inithandler */
 	NULL,