diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2023-01-06 03:42:34 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2023-01-06 06:21:40 +0100 |
| commit | 0e34348d0bc0b1522f75d6212a53d6d1d1367980 (patch) | |
| tree | efe7bc30096318567802833b18f5d0333d30c321 /channels.c | |
| parent | upstream: tweak channel ctype names (diff) | |
| download | openssh-0e34348d0bc0b1522f75d6212a53d6d1d1367980.tar.xz openssh-0e34348d0bc0b1522f75d6212a53d6d1d1367980.zip | |
upstream: Add channel_set_xtype()
This sets an "extended" channel type after channel creation (e.g.
"session:subsystem:sftp") that will be used for setting channel inactivity
timeouts.
ok markus dtucker
OpenBSD-Commit-ID: 42564aa92345045b4a74300528f960416a15d4ca
Diffstat (limited to 'channels.c')
| -rw-r--r-- | channels.c | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/channels.c b/channels.c index 9332d603a..7bc6c7e41 100644 --- a/channels.c +++ b/channels.c @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.424 2023/01/06 02:41:49 djm Exp $ */ +/* $OpenBSD: channels.c,v 1.425 2023/01/06 02:42:34 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -297,6 +297,24 @@ channel_lookup(struct ssh *ssh, int id) } /* + * Sets "extended type" of a channel; used by session layer to add additional + * information about channel types (e.g. shell, login, subsystem) that can then + * be used to select timeouts. + */ +void +channel_set_xtype(struct ssh *ssh, int id, const char *xctype) +{ + Channel *c; + + if ((c = channel_by_id(ssh, id)) == NULL) + fatal_f("missing channel %d", id); + if (c->xctype != NULL) + free(c->xctype); + c->xctype = xstrdup(xctype); + debug2_f("labeled channel %d as %s", id, xctype); +} + +/* * Register filedescriptors for a channel, used when allocating a channel or * when the channel consumer/producer is ready, e.g. shell exec'd */ @@ -656,6 +674,8 @@ channel_free(struct ssh *ssh, Channel *c) c->path = NULL; free(c->listening_addr); c->listening_addr = NULL; + free(c->xctype); + c->xctype = NULL; while ((cc = TAILQ_FIRST(&c->status_confirms)) != NULL) { if (cc->abandon_cb != NULL) cc->abandon_cb(ssh, c, cc->ctx); @@ -871,9 +891,9 @@ channel_format_status(const Channel *c) { char *ret = NULL; - xasprintf(&ret, "t%d %s%u i%u/%zu o%u/%zu e[%s]/%zu " + xasprintf(&ret, "t%d [%s] %s%u i%u/%zu o%u/%zu e[%s]/%zu " "fd %d/%d/%d sock %d cc %d io 0x%02x/0x%02x", - c->type, + c->type, c->xctype != NULL ? c->xctype : c->ctype, c->have_remote_id ? "r" : "nr", c->remote_id, c->istate, sshbuf_len(c->input), c->ostate, sshbuf_len(c->output), |