Skip to content

Commit c3b785a

Browse files
committed
Manual Merge change 3c6b77b
3c6b77b Ray Hayes <[email protected]> 7/28/2016 12:10:04 PM -07:00 First version with console changes.
1 parent 367476c commit c3b785a

File tree

20 files changed

+3522
-2810
lines changed

20 files changed

+3522
-2810
lines changed

channels.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2442,6 +2442,8 @@ channel_input_extended_data(int type, u_int32_t seq, void *ctxt)
24422442
char *data;
24432443
u_int data_len, tcode;
24442444
Channel *c;
2445+
char *respbuf = NULL;
2446+
size_t resplen = 0;
24452447

24462448
/* Get the channel number and verify it. */
24472449
id = packet_get_int();
@@ -2480,8 +2482,14 @@ channel_input_extended_data(int type, u_int32_t seq, void *ctxt)
24802482
#ifndef WIN32_FIXME//N
24812483
buffer_append(&c->extended, data, data_len);
24822484
#else
2483-
if ( c->client_tty )
2484-
telProcessNetwork ( data, data_len ); // run it by ANSI engine if it is the ssh client
2485+
if (c->client_tty) {
2486+
if (telProcessNetwork(data, data_len, &respbuf, &resplen) > 0) // run it by ANSI engine if it is the ssh client
2487+
buffer_append(&c->extended, data, data_len);
2488+
2489+
if (respbuf != NULL) {
2490+
sshbuf_put(&c->input, respbuf, resplen);
2491+
}
2492+
}
24852493
else
24862494
buffer_append(&c->extended, data, data_len);
24872495
#endif
54.3 MB
Binary file not shown.

0 commit comments

Comments
 (0)