From 8e8f091aba6ebf511020a3a13be11402d7331e40 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Tue, 27 Jan 2026 10:43:50 +0100 Subject: [PATCH] connector: Simplify handling of out/err channels Based on stale MR !461. Signed-off-by: Jakub Jelen Reviewed-by: Andreas Schneider --- src/connector.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/connector.c b/src/connector.c index 09351730..ae981a47 100644 --- a/src/connector.c +++ b/src/connector.c @@ -542,16 +542,8 @@ static int ssh_connector_channel_data_cb(ssh_session session, window_len = MIN(window, len); /* Route the data to the right exception channel */ - if (is_stderr && (connector->out_flags & SSH_CONNECTOR_STDERR)) { - w = ssh_channel_write_stderr(connector->out_channel, - data, - window_len); - } else if (!is_stderr && - (connector->out_flags & SSH_CONNECTOR_STDOUT)) { - w = ssh_channel_write(connector->out_channel, - data, - window_len); - } else if (connector->out_flags & SSH_CONNECTOR_STDOUT) { + if (connector->out_flags & SSH_CONNECTOR_STDOUT && + !(is_stderr && (connector->out_flags & SSH_CONNECTOR_STDERR))) { w = ssh_channel_write(connector->out_channel, data, window_len);