src/usr.bin/ssh/mux.c - diff

Return to mux.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/mux.c between version 1.78 and 1.79

version 1.78, 2019/01/19 21:31:32

version 1.79, 2019/01/19 21:35:25

Line 55

#include "clientloop.h"

#include "ssherr.h"

#include "opacket.h" /* XXX */

extern struct ssh *active_state; /* XXX */

/* from ssh.c */

extern int tty_flag;

extern Options options;

Line 600

Line 597

struct Forward *rfwd;

Channel *c;

struct sshbuf *out;

u_int port;

int r;

if ((c = channel_by_id(ssh, fctx->cid)) == NULL) {

Line 622

Line 620

rfwd->connect_host, rfwd->connect_port);

if (type == SSH2_MSG_REQUEST_SUCCESS) {

if (rfwd->listen_port == 0) {

rfwd->allocated_port = packet_get_int();

if ((r = sshpkt_get_u32(ssh, &port)) != 0)

fatal("%s: packet error: %s",

__func__, ssh_err(r));

if (port > 65535) {

fatal("Invalid allocated port %u for "

"mux remote forward to %s:%d", port,

rfwd->connect_host, rfwd->connect_port);

}

rfwd->allocated_port = (int)port;

debug("Allocated port %u for mux remote forward"

" to %s:%d", rfwd->allocated_port,

rfwd->connect_host, rfwd->connect_port);

Line 1396

Line 1402

if (cctx->want_agent_fwd && options.forward_agent) {

debug("Requesting authentication agent forwarding.");

channel_request_start(ssh, id, "auth-agent-req@openssh.com", 0);

packet_send();

if ((r = sshpkt_send(ssh)) != 0)

fatal("%s: packet error: %s", __func__, ssh_err(r));

}

client_session2_setup(ssh, id, cctx->want_tty, cctx->want_subsys,