diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2017-09-12 06:35:31 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-09-12 17:37:03 +1000 |
| commit | 9f53229c2ac97dbc6f5a03657de08a1150a9ac7e (patch) | |
| tree | 4f74dc06676dc6dce2b2bc3aa6beb248a1d8def6 /nchan.c | |
| parent | dbee4119b502e3f8b6cd3282c69c537fd01d8e16 (diff) | |
upstream commit
Make remote channel ID a u_int
Previously we tracked the remote channel IDs in an int, but this is
strictly incorrect: the wire protocol uses uint32 and there is nothing
in-principle stopping a SSH implementation from sending, say, 0xffff0000.
In practice everyone numbers their channels sequentially, so this has
never been a problem.
ok markus@
Upstream-ID: b9f4cd3dc53155b4a5c995c0adba7da760d03e73
Diffstat (limited to 'nchan.c')
| -rw-r--r-- | nchan.c | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: nchan.c,v 1.66 2017/09/12 06:32:07 djm Exp $ */ +/* $OpenBSD: nchan.c,v 1.67 2017/09/12 06:35:32 djm Exp $ */ /* * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. * @@ -183,6 +183,9 @@ chan_send_eof2(struct ssh *ssh, Channel *c) debug2("channel %d: send eof", c->self); switch (c->istate) { case CHAN_INPUT_WAIT_DRAIN: + if (!c->have_remote_id) + fatal("%s: channel %d: no remote_id", + __func__, c->self); if ((r = sshpkt_start(ssh, SSH2_MSG_CHANNEL_EOF)) != 0 || (r = sshpkt_put_u32(ssh, c->remote_id)) != 0 || (r = sshpkt_send(ssh)) != 0) @@ -209,6 +212,9 @@ chan_send_close2(struct ssh *ssh, Channel *c) } else if (c->flags & CHAN_CLOSE_SENT) { error("channel %d: already sent close", c->self); } else { + if (!c->have_remote_id) + fatal("%s: channel %d: no remote_id", + __func__, c->self); if ((r = sshpkt_start(ssh, SSH2_MSG_CHANNEL_CLOSE)) != 0 || (r = sshpkt_put_u32(ssh, c->remote_id)) != 0 || (r = sshpkt_send(ssh)) != 0) @@ -230,6 +236,8 @@ chan_send_eow2(struct ssh *ssh, Channel *c) } if (!(datafellows & SSH_NEW_OPENSSH)) return; + if (!c->have_remote_id) + fatal("%s: channel %d: no remote_id", __func__, c->self); if ((r = sshpkt_start(ssh, SSH2_MSG_CHANNEL_REQUEST)) != 0 || (r = sshpkt_put_u32(ssh, c->remote_id)) != 0 || (r = sshpkt_put_cstring(ssh, "eow@openssh.com")) != 0 || |