Skip to content
/ openwrt Public
forked from openwrt/openwrt

Commit

Permalink
dropbear: fix regression where TTY modes weren't reset for client
Browse files Browse the repository at this point in the history
cherry-pick upstream commit 7bc6280613f5ab4ee86c14c779739070e5784dfe

Signed-off-by: Konstantin Demin <rockdrilla@gmail.com>
  • Loading branch information
rockdrilla authored and dedeckeh committed Mar 25, 2019
1 parent ddf1a06 commit c40a84c
Showing 1 changed file with 46 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
Hash: 7bc6280613f5ab4ee86c14c779739070e5784dfe
From: Matt Johnston <matt@ucc.asn.au>
Date: Sun, 24 Mar 2019 20:41:02 +0800
Subject: Fix regression where TTY modes weren't reset for client

--- a/cli-chansession.c
+++ b/cli-chansession.c
@@ -35,7 +35,7 @@
#include "chansession.h"
#include "agentfwd.h"

-static void cli_cleanupchansess(const struct Channel *channel);
+static void cli_closechansess(const struct Channel *channel);
static int cli_initchansess(struct Channel *channel);
static void cli_chansessreq(struct Channel *channel);
static void send_chansess_pty_req(const struct Channel *channel);
@@ -51,8 +51,8 @@ const struct ChanType clichansess = {
cli_initchansess, /* inithandler */
NULL, /* checkclosehandler */
cli_chansessreq, /* reqhandler */
- NULL, /* closehandler */
- cli_cleanupchansess, /* cleanup */
+ cli_closechansess, /* closehandler */
+ NULL, /* cleanup */
};

static void cli_chansessreq(struct Channel *channel) {
@@ -84,7 +84,7 @@ out:


/* If the main session goes, we close it up */
-static void cli_cleanupchansess(const struct Channel *UNUSED(channel)) {
+static void cli_closechansess(const struct Channel *UNUSED(channel)) {
cli_tty_cleanup(); /* Restore tty modes etc */

/* This channel hasn't gone yet, so we have > 1 */
@@ -388,8 +388,8 @@ static const struct ChanType cli_chan_ne
cli_init_netcat, /* inithandler */
NULL,
NULL,
+ cli_closechansess,
NULL,
- cli_cleanupchansess
};

void cli_send_netcat_request() {

0 comments on commit c40a84c

Please sign in to comment.