From 94842bfe9b09fc93189c6ed0dc9bbebc1d44a426 Mon Sep 17 00:00:00 2001 From: "dlg@openbsd.org" Date: Tue, 4 Jul 2023 03:59:21 +0000 Subject: [PATCH] upstream: add support for unix domain sockets to ssh -W ok djm@ dtucker@ OpenBSD-Commit-ID: 3e6d47567b895c7c28855c7bd614e106c987a6d8 --- channels.c | 7 ++++--- channels.h | 4 ++-- ssh.c | 6 ++++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/channels.c b/channels.c index f2c873d70..da66b7b34 100644 --- a/channels.c +++ b/channels.c @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.431 2023/06/05 13:24:36 millert Exp $ */ +/* $OpenBSD: channels.c,v 1.432 2023/07/04 03:59:21 dlg Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1634,7 +1634,7 @@ channel_decode_socks5(Channel *c, struct sshbuf *input, struct sshbuf *output) Channel * channel_connect_stdio_fwd(struct ssh *ssh, - const char *host_to_connect, u_short port_to_connect, + const char *host_to_connect, int port_to_connect, int in, int out, int nonblock) { Channel *c; @@ -1651,7 +1651,8 @@ channel_connect_stdio_fwd(struct ssh *ssh, c->force_drain = 1; channel_register_fds(ssh, c, in, out, -1, 0, 1, 0); - port_open_helper(ssh, c, "direct-tcpip"); + port_open_helper(ssh, c, port_to_connect == PORT_STREAMLOCAL ? + "direct-streamlocal@openssh.com" : "direct-tcpip"); return c; } diff --git a/channels.h b/channels.h index 90f6d2904..7afba7837 100644 --- a/channels.h +++ b/channels.h @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.h,v 1.150 2023/06/05 13:24:36 millert Exp $ */ +/* $OpenBSD: channels.h,v 1.151 2023/07/04 03:59:21 dlg Exp $ */ /* * Author: Tatu Ylonen @@ -357,7 +357,7 @@ Channel *channel_connect_to_port(struct ssh *, const char *, u_short, char *, char *, int *, const char **); Channel *channel_connect_to_path(struct ssh *, const char *, char *, char *); Channel *channel_connect_stdio_fwd(struct ssh *, const char*, - u_short, int, int, int); + int, int, int, int); Channel *channel_connect_by_listen_address(struct ssh *, const char *, u_short, char *, char *); Channel *channel_connect_by_listen_path(struct ssh *, const char *, diff --git a/ssh.c b/ssh.c index 6fc99d88d..83c509ccf 100644 --- a/ssh.c +++ b/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.589 2023/06/21 05:08:32 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.590 2023/07/04 03:59:21 dlg Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -907,7 +907,9 @@ main(int ac, char **av) if (muxclient_command != 0) fatal("Cannot specify stdio forward with -O"); if (parse_forward(&fwd, optarg, 1, 0)) { - options.stdio_forward_host = fwd.listen_host; + options.stdio_forward_host = + fwd.listen_port == PORT_STREAMLOCAL ? + fwd.listen_path : fwd.listen_host; options.stdio_forward_port = fwd.listen_port; free(fwd.connect_host); } else {