1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Copyright (c) 1999 Markus Friedl. All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
1999-10-27 03:42:43 +00:00
|
|
|
#include "includes.h"
|
2001-03-05 06:16:11 +00:00
|
|
|
RCSID("$OpenBSD: nchan.c,v 1.23 2001/02/28 08:54:55 markus Exp $");
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2001-01-22 05:34:40 +00:00
|
|
|
#include "ssh1.h"
|
|
|
|
#include "ssh2.h"
|
1999-10-27 03:42:43 +00:00
|
|
|
#include "buffer.h"
|
|
|
|
#include "packet.h"
|
|
|
|
#include "channels.h"
|
|
|
|
#include "nchan.h"
|
2000-04-04 04:38:59 +00:00
|
|
|
#include "compat.h"
|
2001-01-22 05:34:40 +00:00
|
|
|
#include "log.h"
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2000-04-04 04:38:59 +00:00
|
|
|
/* functions manipulating channel states */
|
1999-10-27 03:42:43 +00:00
|
|
|
/*
|
1999-11-24 13:26:21 +00:00
|
|
|
* EVENTS update channel input/output states execute ACTIONS
|
1999-10-27 03:42:43 +00:00
|
|
|
*/
|
|
|
|
/* events concerning the INPUT from socket for channel (istate) */
|
2000-04-04 04:38:59 +00:00
|
|
|
chan_event_fn *chan_rcvd_oclose = NULL;
|
|
|
|
chan_event_fn *chan_read_failed = NULL;
|
|
|
|
chan_event_fn *chan_ibuf_empty = NULL;
|
|
|
|
/* events concerning the OUTPUT from channel for socket (ostate) */
|
|
|
|
chan_event_fn *chan_rcvd_ieof = NULL;
|
|
|
|
chan_event_fn *chan_write_failed = NULL;
|
|
|
|
chan_event_fn *chan_obuf_empty = NULL;
|
|
|
|
/*
|
|
|
|
* ACTIONS: should never update the channel states
|
|
|
|
*/
|
|
|
|
static void chan_send_ieof1(Channel *c);
|
|
|
|
static void chan_send_oclose1(Channel *c);
|
|
|
|
static void chan_send_close2(Channel *c);
|
|
|
|
static void chan_send_eof2(Channel *c);
|
|
|
|
|
|
|
|
/* helper */
|
|
|
|
static void chan_shutdown_write(Channel *c);
|
|
|
|
static void chan_shutdown_read(Channel *c);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* SSH1 specific implementation of event functions
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void
|
|
|
|
chan_rcvd_oclose1(Channel *c)
|
1999-11-24 13:26:21 +00:00
|
|
|
{
|
2000-04-04 04:38:59 +00:00
|
|
|
debug("channel %d: rcvd oclose", c->self);
|
1999-11-24 13:26:21 +00:00
|
|
|
switch (c->istate) {
|
1999-10-27 03:42:43 +00:00
|
|
|
case CHAN_INPUT_WAIT_OCLOSE:
|
2000-04-04 04:38:59 +00:00
|
|
|
debug("channel %d: input wait_oclose -> closed", c->self);
|
1999-11-24 13:26:21 +00:00
|
|
|
c->istate = CHAN_INPUT_CLOSED;
|
1999-10-27 03:42:43 +00:00
|
|
|
break;
|
|
|
|
case CHAN_INPUT_OPEN:
|
2000-04-04 04:38:59 +00:00
|
|
|
debug("channel %d: input open -> closed", c->self);
|
1999-10-27 03:42:43 +00:00
|
|
|
chan_shutdown_read(c);
|
2000-04-04 04:38:59 +00:00
|
|
|
chan_send_ieof1(c);
|
1999-11-24 13:26:21 +00:00
|
|
|
c->istate = CHAN_INPUT_CLOSED;
|
2000-01-14 04:45:46 +00:00
|
|
|
break;
|
|
|
|
case CHAN_INPUT_WAIT_DRAIN:
|
|
|
|
/* both local read_failed and remote write_failed */
|
2000-04-04 04:38:59 +00:00
|
|
|
log("channel %d: input drain -> closed", c->self);
|
|
|
|
chan_send_ieof1(c);
|
2000-01-14 04:45:46 +00:00
|
|
|
c->istate = CHAN_INPUT_CLOSED;
|
1999-10-27 03:42:43 +00:00
|
|
|
break;
|
|
|
|
default:
|
2000-04-04 04:38:59 +00:00
|
|
|
error("channel %d: protocol error: chan_rcvd_oclose for istate %d",
|
|
|
|
c->self, c->istate);
|
2000-01-14 04:45:46 +00:00
|
|
|
return;
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
}
|
2000-04-04 04:38:59 +00:00
|
|
|
static void
|
|
|
|
chan_read_failed_12(Channel *c)
|
1999-11-24 13:26:21 +00:00
|
|
|
{
|
2000-04-04 04:38:59 +00:00
|
|
|
debug("channel %d: read failed", c->self);
|
1999-11-24 13:26:21 +00:00
|
|
|
switch (c->istate) {
|
1999-10-27 03:42:43 +00:00
|
|
|
case CHAN_INPUT_OPEN:
|
2000-04-04 04:38:59 +00:00
|
|
|
debug("channel %d: input open -> drain", c->self);
|
1999-10-27 03:42:43 +00:00
|
|
|
chan_shutdown_read(c);
|
1999-11-24 13:26:21 +00:00
|
|
|
c->istate = CHAN_INPUT_WAIT_DRAIN;
|
2000-05-09 01:02:59 +00:00
|
|
|
if (buffer_len(&c->input) == 0) {
|
|
|
|
debug("channel %d: input: no drain shortcut", c->self);
|
|
|
|
chan_ibuf_empty(c);
|
|
|
|
}
|
1999-10-27 03:42:43 +00:00
|
|
|
break;
|
|
|
|
default:
|
2000-04-04 04:38:59 +00:00
|
|
|
error("channel %d: internal error: we do not read, but chan_read_failed for istate %d",
|
|
|
|
c->self, c->istate);
|
1999-10-27 03:42:43 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2000-04-04 04:38:59 +00:00
|
|
|
static void
|
|
|
|
chan_ibuf_empty1(Channel *c)
|
1999-11-24 13:26:21 +00:00
|
|
|
{
|
2000-04-04 04:38:59 +00:00
|
|
|
debug("channel %d: ibuf empty", c->self);
|
1999-11-24 13:26:21 +00:00
|
|
|
if (buffer_len(&c->input)) {
|
2000-04-04 04:38:59 +00:00
|
|
|
error("channel %d: internal error: chan_ibuf_empty for non empty buffer",
|
|
|
|
c->self);
|
1999-10-27 03:42:43 +00:00
|
|
|
return;
|
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
switch (c->istate) {
|
1999-10-27 03:42:43 +00:00
|
|
|
case CHAN_INPUT_WAIT_DRAIN:
|
2000-04-04 04:38:59 +00:00
|
|
|
debug("channel %d: input drain -> wait_oclose", c->self);
|
|
|
|
chan_send_ieof1(c);
|
1999-11-24 13:26:21 +00:00
|
|
|
c->istate = CHAN_INPUT_WAIT_OCLOSE;
|
1999-10-27 03:42:43 +00:00
|
|
|
break;
|
|
|
|
default:
|
2000-04-04 04:38:59 +00:00
|
|
|
error("channel %d: internal error: chan_ibuf_empty for istate %d",
|
|
|
|
c->self, c->istate);
|
1999-10-27 03:42:43 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2000-04-04 04:38:59 +00:00
|
|
|
static void
|
|
|
|
chan_rcvd_ieof1(Channel *c)
|
1999-11-24 13:26:21 +00:00
|
|
|
{
|
2000-04-04 04:38:59 +00:00
|
|
|
debug("channel %d: rcvd ieof", c->self);
|
- Remove references to SSLeay.
- Big OpenBSD CVS update
- markus@cvs.openbsd.org
[clientloop.c]
- typo
[session.c]
- update proctitle on pty alloc/dealloc, e.g. w/ windows client
[session.c]
- update proctitle for proto 1, too
[channels.h nchan.c serverloop.c session.c sshd.c]
- use c-style comments
- deraadt@cvs.openbsd.org
[scp.c]
- more atomicio
- markus@cvs.openbsd.org
[channels.c]
- set O_NONBLOCK
[ssh.1]
- update AUTHOR
[readconf.c ssh-keygen.c ssh.h]
- default DSA key file ~/.ssh/id_dsa
[clientloop.c]
- typo, rm verbose debug
- deraadt@cvs.openbsd.org
[ssh-keygen.1]
- document DSA use of ssh-keygen
[sshd.8]
- a start at describing what i understand of the DSA side
[ssh-keygen.1]
- document -X and -x
[ssh-keygen.c]
- simplify usage
- markus@cvs.openbsd.org
[sshd.8]
- there is no rhosts_dsa
[ssh-keygen.1]
- document -y, update -X,-x
[nchan.c]
- fix close for non-open ssh1 channels
[servconf.c servconf.h ssh.h sshd.8 sshd.c ]
- s/DsaKey/HostDSAKey/, document option
[sshconnect2.c]
- respect number_of_password_prompts
[channels.c channels.h servconf.c servconf.h session.c sshd.8]
- GatewayPorts for sshd, ok deraadt@
[ssh-add.1 ssh-agent.1 ssh.1]
- more doc on: DSA, id_dsa, known_hosts2, authorized_keys2
[ssh.1]
- more info on proto 2
[sshd.8]
- sync AUTHOR w/ ssh.1
[key.c key.h sshconnect.c]
- print key type when talking about host keys
[packet.c]
- clear padding in ssh2
[dsa.c key.c radix.c ssh.h sshconnect1.c uuencode.c uuencode.h]
- replace broken uuencode w/ libc b64_ntop
[auth2.c]
- log failure before sending the reply
[key.c radix.c uuencode.c]
- remote trailing comments before calling __b64_pton
[auth2.c readconf.c readconf.h servconf.c servconf.h ssh.1]
[sshconnect2.c sshd.8]
- add DSAAuthetication option to ssh/sshd, document SSH2 in sshd.8
- Bring in b64_ntop and b64_pton from OpenBSD libc (bsd-base64.[ch])
2000-05-07 02:03:14 +00:00
|
|
|
if (c->type != SSH_CHANNEL_OPEN) {
|
|
|
|
debug("channel %d: non-open", c->self);
|
|
|
|
if (c->istate == CHAN_INPUT_OPEN) {
|
|
|
|
debug("channel %d: non-open: input open -> wait_oclose", c->self);
|
|
|
|
chan_shutdown_read(c);
|
|
|
|
chan_send_ieof1(c);
|
|
|
|
c->istate = CHAN_INPUT_WAIT_OCLOSE;
|
|
|
|
} else {
|
|
|
|
error("channel %d: istate %d != open", c->self, c->istate);
|
|
|
|
}
|
|
|
|
if (c->ostate == CHAN_OUTPUT_OPEN) {
|
|
|
|
debug("channel %d: non-open: output open -> closed", c->self);
|
|
|
|
chan_send_oclose1(c);
|
|
|
|
c->ostate = CHAN_OUTPUT_CLOSED;
|
|
|
|
} else {
|
|
|
|
error("channel %d: ostate %d != open", c->self, c->ostate);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
switch (c->ostate) {
|
1999-10-27 03:42:43 +00:00
|
|
|
case CHAN_OUTPUT_OPEN:
|
2000-04-04 04:38:59 +00:00
|
|
|
debug("channel %d: output open -> drain", c->self);
|
1999-11-24 13:26:21 +00:00
|
|
|
c->ostate = CHAN_OUTPUT_WAIT_DRAIN;
|
1999-10-27 03:42:43 +00:00
|
|
|
break;
|
|
|
|
case CHAN_OUTPUT_WAIT_IEOF:
|
2000-04-04 04:38:59 +00:00
|
|
|
debug("channel %d: output wait_ieof -> closed", c->self);
|
1999-11-24 13:26:21 +00:00
|
|
|
c->ostate = CHAN_OUTPUT_CLOSED;
|
1999-10-27 03:42:43 +00:00
|
|
|
break;
|
|
|
|
default:
|
2000-04-04 04:38:59 +00:00
|
|
|
error("channel %d: protocol error: chan_rcvd_ieof for ostate %d",
|
|
|
|
c->self, c->ostate);
|
1999-10-27 03:42:43 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2000-04-04 04:38:59 +00:00
|
|
|
static void
|
|
|
|
chan_write_failed1(Channel *c)
|
1999-11-24 13:26:21 +00:00
|
|
|
{
|
2000-04-04 04:38:59 +00:00
|
|
|
debug("channel %d: write failed", c->self);
|
1999-11-24 13:26:21 +00:00
|
|
|
switch (c->ostate) {
|
1999-10-27 03:42:43 +00:00
|
|
|
case CHAN_OUTPUT_OPEN:
|
2000-04-04 04:38:59 +00:00
|
|
|
debug("channel %d: output open -> wait_ieof", c->self);
|
|
|
|
chan_send_oclose1(c);
|
1999-11-24 13:26:21 +00:00
|
|
|
c->ostate = CHAN_OUTPUT_WAIT_IEOF;
|
1999-10-27 03:42:43 +00:00
|
|
|
break;
|
|
|
|
case CHAN_OUTPUT_WAIT_DRAIN:
|
2000-04-04 04:38:59 +00:00
|
|
|
debug("channel %d: output wait_drain -> closed", c->self);
|
|
|
|
chan_send_oclose1(c);
|
1999-11-24 13:26:21 +00:00
|
|
|
c->ostate = CHAN_OUTPUT_CLOSED;
|
1999-10-27 03:42:43 +00:00
|
|
|
break;
|
|
|
|
default:
|
2000-04-04 04:38:59 +00:00
|
|
|
error("channel %d: internal error: chan_write_failed for ostate %d",
|
|
|
|
c->self, c->ostate);
|
1999-10-27 03:42:43 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2000-04-04 04:38:59 +00:00
|
|
|
static void
|
|
|
|
chan_obuf_empty1(Channel *c)
|
1999-11-24 13:26:21 +00:00
|
|
|
{
|
2000-04-04 04:38:59 +00:00
|
|
|
debug("channel %d: obuf empty", c->self);
|
1999-11-24 13:26:21 +00:00
|
|
|
if (buffer_len(&c->output)) {
|
2000-04-04 04:38:59 +00:00
|
|
|
error("channel %d: internal error: chan_obuf_empty for non empty buffer",
|
|
|
|
c->self);
|
1999-10-27 03:42:43 +00:00
|
|
|
return;
|
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
switch (c->ostate) {
|
1999-10-27 03:42:43 +00:00
|
|
|
case CHAN_OUTPUT_WAIT_DRAIN:
|
2000-04-04 04:38:59 +00:00
|
|
|
debug("channel %d: output drain -> closed", c->self);
|
|
|
|
chan_send_oclose1(c);
|
1999-11-24 13:26:21 +00:00
|
|
|
c->ostate = CHAN_OUTPUT_CLOSED;
|
1999-10-27 03:42:43 +00:00
|
|
|
break;
|
|
|
|
default:
|
2000-04-04 04:38:59 +00:00
|
|
|
error("channel %d: internal error: chan_obuf_empty for ostate %d",
|
|
|
|
c->self, c->ostate);
|
1999-10-27 03:42:43 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
static void
|
2000-04-04 04:38:59 +00:00
|
|
|
chan_send_ieof1(Channel *c)
|
1999-11-24 13:26:21 +00:00
|
|
|
{
|
2000-04-04 04:38:59 +00:00
|
|
|
debug("channel %d: send ieof", c->self);
|
1999-11-24 13:26:21 +00:00
|
|
|
switch (c->istate) {
|
1999-10-27 03:42:43 +00:00
|
|
|
case CHAN_INPUT_OPEN:
|
|
|
|
case CHAN_INPUT_WAIT_DRAIN:
|
|
|
|
packet_start(SSH_MSG_CHANNEL_INPUT_EOF);
|
|
|
|
packet_put_int(c->remote_id);
|
|
|
|
packet_send();
|
|
|
|
break;
|
|
|
|
default:
|
2000-04-04 04:38:59 +00:00
|
|
|
error("channel %d: internal error: cannot send ieof for istate %d",
|
|
|
|
c->self, c->istate);
|
1999-10-27 03:42:43 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
static void
|
2000-04-04 04:38:59 +00:00
|
|
|
chan_send_oclose1(Channel *c)
|
1999-11-24 13:26:21 +00:00
|
|
|
{
|
2000-04-04 04:38:59 +00:00
|
|
|
debug("channel %d: send oclose", c->self);
|
1999-11-24 13:26:21 +00:00
|
|
|
switch (c->ostate) {
|
1999-10-27 03:42:43 +00:00
|
|
|
case CHAN_OUTPUT_OPEN:
|
|
|
|
case CHAN_OUTPUT_WAIT_DRAIN:
|
|
|
|
chan_shutdown_write(c);
|
|
|
|
buffer_consume(&c->output, buffer_len(&c->output));
|
|
|
|
packet_start(SSH_MSG_CHANNEL_OUTPUT_CLOSE);
|
|
|
|
packet_put_int(c->remote_id);
|
|
|
|
packet_send();
|
|
|
|
break;
|
|
|
|
default:
|
2000-04-04 04:38:59 +00:00
|
|
|
error("channel %d: internal error: cannot send oclose for ostate %d",
|
|
|
|
c->self, c->ostate);
|
1999-10-27 03:42:43 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
|
2000-04-04 04:38:59 +00:00
|
|
|
/*
|
|
|
|
* the same for SSH2
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
static void
|
2000-04-04 04:38:59 +00:00
|
|
|
chan_rcvd_oclose2(Channel *c)
|
1999-11-24 13:26:21 +00:00
|
|
|
{
|
2000-04-04 04:38:59 +00:00
|
|
|
debug("channel %d: rcvd close", c->self);
|
|
|
|
if (c->flags & CHAN_CLOSE_RCVD)
|
|
|
|
error("channel %d: protocol error: close rcvd twice", c->self);
|
|
|
|
c->flags |= CHAN_CLOSE_RCVD;
|
|
|
|
if (c->type == SSH_CHANNEL_LARVAL) {
|
|
|
|
/* tear down larval channels immediately */
|
|
|
|
c->ostate = CHAN_OUTPUT_CLOSED;
|
|
|
|
c->istate = CHAN_INPUT_CLOSED;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
switch (c->ostate) {
|
|
|
|
case CHAN_OUTPUT_OPEN:
|
|
|
|
/* wait until a data from the channel is consumed if a CLOSE is received */
|
|
|
|
debug("channel %d: output open -> drain", c->self);
|
|
|
|
c->ostate = CHAN_OUTPUT_WAIT_DRAIN;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
switch (c->istate) {
|
|
|
|
case CHAN_INPUT_OPEN:
|
|
|
|
debug("channel %d: input open -> closed", c->self);
|
|
|
|
chan_shutdown_read(c);
|
|
|
|
break;
|
|
|
|
case CHAN_INPUT_WAIT_DRAIN:
|
|
|
|
debug("channel %d: input drain -> closed", c->self);
|
|
|
|
chan_send_eof2(c);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
c->istate = CHAN_INPUT_CLOSED;
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
static void
|
2000-04-04 04:38:59 +00:00
|
|
|
chan_ibuf_empty2(Channel *c)
|
|
|
|
{
|
|
|
|
debug("channel %d: ibuf empty", c->self);
|
|
|
|
if (buffer_len(&c->input)) {
|
|
|
|
error("channel %d: internal error: chan_ibuf_empty for non empty buffer",
|
|
|
|
c->self);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
switch (c->istate) {
|
|
|
|
case CHAN_INPUT_WAIT_DRAIN:
|
|
|
|
debug("channel %d: input drain -> closed", c->self);
|
|
|
|
if (!(c->flags & CHAN_CLOSE_SENT))
|
|
|
|
chan_send_eof2(c);
|
|
|
|
c->istate = CHAN_INPUT_CLOSED;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
error("channel %d: internal error: chan_ibuf_empty for istate %d",
|
|
|
|
c->self, c->istate);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
static void
|
|
|
|
chan_rcvd_ieof2(Channel *c)
|
1999-11-24 13:26:21 +00:00
|
|
|
{
|
2000-04-04 04:38:59 +00:00
|
|
|
debug("channel %d: rcvd eof", c->self);
|
|
|
|
if (c->ostate == CHAN_OUTPUT_OPEN) {
|
|
|
|
debug("channel %d: output open -> drain", c->self);
|
|
|
|
c->ostate = CHAN_OUTPUT_WAIT_DRAIN;
|
|
|
|
}
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
2000-04-04 04:38:59 +00:00
|
|
|
static void
|
|
|
|
chan_write_failed2(Channel *c)
|
|
|
|
{
|
|
|
|
debug("channel %d: write failed", c->self);
|
|
|
|
switch (c->ostate) {
|
|
|
|
case CHAN_OUTPUT_OPEN:
|
|
|
|
debug("channel %d: output open -> closed", c->self);
|
- Remove references to SSLeay.
- Big OpenBSD CVS update
- markus@cvs.openbsd.org
[clientloop.c]
- typo
[session.c]
- update proctitle on pty alloc/dealloc, e.g. w/ windows client
[session.c]
- update proctitle for proto 1, too
[channels.h nchan.c serverloop.c session.c sshd.c]
- use c-style comments
- deraadt@cvs.openbsd.org
[scp.c]
- more atomicio
- markus@cvs.openbsd.org
[channels.c]
- set O_NONBLOCK
[ssh.1]
- update AUTHOR
[readconf.c ssh-keygen.c ssh.h]
- default DSA key file ~/.ssh/id_dsa
[clientloop.c]
- typo, rm verbose debug
- deraadt@cvs.openbsd.org
[ssh-keygen.1]
- document DSA use of ssh-keygen
[sshd.8]
- a start at describing what i understand of the DSA side
[ssh-keygen.1]
- document -X and -x
[ssh-keygen.c]
- simplify usage
- markus@cvs.openbsd.org
[sshd.8]
- there is no rhosts_dsa
[ssh-keygen.1]
- document -y, update -X,-x
[nchan.c]
- fix close for non-open ssh1 channels
[servconf.c servconf.h ssh.h sshd.8 sshd.c ]
- s/DsaKey/HostDSAKey/, document option
[sshconnect2.c]
- respect number_of_password_prompts
[channels.c channels.h servconf.c servconf.h session.c sshd.8]
- GatewayPorts for sshd, ok deraadt@
[ssh-add.1 ssh-agent.1 ssh.1]
- more doc on: DSA, id_dsa, known_hosts2, authorized_keys2
[ssh.1]
- more info on proto 2
[sshd.8]
- sync AUTHOR w/ ssh.1
[key.c key.h sshconnect.c]
- print key type when talking about host keys
[packet.c]
- clear padding in ssh2
[dsa.c key.c radix.c ssh.h sshconnect1.c uuencode.c uuencode.h]
- replace broken uuencode w/ libc b64_ntop
[auth2.c]
- log failure before sending the reply
[key.c radix.c uuencode.c]
- remote trailing comments before calling __b64_pton
[auth2.c readconf.c readconf.h servconf.c servconf.h ssh.1]
[sshconnect2.c sshd.8]
- add DSAAuthetication option to ssh/sshd, document SSH2 in sshd.8
- Bring in b64_ntop and b64_pton from OpenBSD libc (bsd-base64.[ch])
2000-05-07 02:03:14 +00:00
|
|
|
chan_shutdown_write(c); /* ?? */
|
2000-04-04 04:38:59 +00:00
|
|
|
c->ostate = CHAN_OUTPUT_CLOSED;
|
|
|
|
break;
|
|
|
|
case CHAN_OUTPUT_WAIT_DRAIN:
|
|
|
|
debug("channel %d: output drain -> closed", c->self);
|
|
|
|
chan_shutdown_write(c);
|
|
|
|
c->ostate = CHAN_OUTPUT_CLOSED;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
error("channel %d: internal error: chan_write_failed for ostate %d",
|
|
|
|
c->self, c->ostate);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
static void
|
|
|
|
chan_obuf_empty2(Channel *c)
|
|
|
|
{
|
|
|
|
debug("channel %d: obuf empty", c->self);
|
|
|
|
if (buffer_len(&c->output)) {
|
|
|
|
error("internal error: chan_obuf_empty %d for non empty buffer",
|
|
|
|
c->self);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
switch (c->ostate) {
|
|
|
|
case CHAN_OUTPUT_WAIT_DRAIN:
|
|
|
|
debug("channel %d: output drain -> closed", c->self);
|
|
|
|
chan_shutdown_write(c);
|
|
|
|
c->ostate = CHAN_OUTPUT_CLOSED;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
error("channel %d: internal error: chan_obuf_empty for ostate %d",
|
|
|
|
c->self, c->ostate);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
static void
|
|
|
|
chan_send_eof2(Channel *c)
|
|
|
|
{
|
|
|
|
debug("channel %d: send eof", c->self);
|
|
|
|
switch (c->istate) {
|
|
|
|
case CHAN_INPUT_WAIT_DRAIN:
|
|
|
|
packet_start(SSH2_MSG_CHANNEL_EOF);
|
|
|
|
packet_put_int(c->remote_id);
|
|
|
|
packet_send();
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
error("channel %d: internal error: cannot send eof for istate %d",
|
|
|
|
c->self, c->istate);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
static void
|
|
|
|
chan_send_close2(Channel *c)
|
|
|
|
{
|
|
|
|
debug("channel %d: send close", c->self);
|
|
|
|
if (c->ostate != CHAN_OUTPUT_CLOSED ||
|
|
|
|
c->istate != CHAN_INPUT_CLOSED) {
|
|
|
|
error("channel %d: internal error: cannot send close for istate/ostate %d/%d",
|
|
|
|
c->self, c->istate, c->ostate);
|
|
|
|
} else if (c->flags & CHAN_CLOSE_SENT) {
|
|
|
|
error("channel %d: internal error: already sent close", c->self);
|
|
|
|
} else {
|
|
|
|
packet_start(SSH2_MSG_CHANNEL_CLOSE);
|
|
|
|
packet_put_int(c->remote_id);
|
|
|
|
packet_send();
|
|
|
|
c->flags |= CHAN_CLOSE_SENT;
|
|
|
|
}
|
|
|
|
}
|
2001-03-05 06:16:11 +00:00
|
|
|
|
|
|
|
/* shared */
|
|
|
|
|
|
|
|
int
|
|
|
|
chan_is_dead(Channel *c)
|
1999-11-24 13:26:21 +00:00
|
|
|
{
|
2001-03-05 06:16:11 +00:00
|
|
|
if (c->istate != CHAN_INPUT_CLOSED || c->ostate != CHAN_OUTPUT_CLOSED)
|
|
|
|
return 0;
|
|
|
|
if (!compat20) {
|
|
|
|
debug("channel %d: is dead", c->self);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* we have to delay the close message if the efd (for stderr) is
|
|
|
|
* still active
|
|
|
|
*/
|
|
|
|
if (((c->extended_usage != CHAN_EXTENDED_IGNORE) &&
|
|
|
|
buffer_len(&c->extended) > 0)
|
|
|
|
#if 0
|
|
|
|
|| ((c->extended_usage == CHAN_EXTENDED_READ) &&
|
|
|
|
c->efd != -1)
|
|
|
|
#endif
|
|
|
|
) {
|
|
|
|
debug2("channel %d: active efd: %d len %d type %s",
|
|
|
|
c->self, c->efd, buffer_len(&c->extended),
|
|
|
|
c->extended_usage==CHAN_EXTENDED_READ ?
|
|
|
|
"read": "write");
|
|
|
|
} else {
|
2000-04-04 04:38:59 +00:00
|
|
|
if (!(c->flags & CHAN_CLOSE_SENT)) {
|
|
|
|
chan_send_close2(c);
|
|
|
|
}
|
2000-04-16 01:18:38 +00:00
|
|
|
if ((c->flags & CHAN_CLOSE_SENT) &&
|
2000-04-04 04:38:59 +00:00
|
|
|
(c->flags & CHAN_CLOSE_RCVD)) {
|
2001-03-05 06:16:11 +00:00
|
|
|
debug("channel %d: is dead", c->self);
|
|
|
|
return 1;
|
2000-04-16 01:18:38 +00:00
|
|
|
}
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
2001-03-05 06:16:11 +00:00
|
|
|
return 0;
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
2000-04-04 04:38:59 +00:00
|
|
|
|
1999-10-27 03:42:43 +00:00
|
|
|
void
|
1999-11-24 13:26:21 +00:00
|
|
|
chan_init_iostates(Channel *c)
|
|
|
|
{
|
|
|
|
c->ostate = CHAN_OUTPUT_OPEN;
|
|
|
|
c->istate = CHAN_INPUT_OPEN;
|
2000-04-04 04:38:59 +00:00
|
|
|
c->flags = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* init */
|
|
|
|
void
|
|
|
|
chan_init(void)
|
|
|
|
{
|
|
|
|
if (compat20) {
|
|
|
|
chan_rcvd_oclose = chan_rcvd_oclose2;
|
|
|
|
chan_read_failed = chan_read_failed_12;
|
|
|
|
chan_ibuf_empty = chan_ibuf_empty2;
|
|
|
|
|
|
|
|
chan_rcvd_ieof = chan_rcvd_ieof2;
|
|
|
|
chan_write_failed = chan_write_failed2;
|
|
|
|
chan_obuf_empty = chan_obuf_empty2;
|
|
|
|
} else {
|
|
|
|
chan_rcvd_oclose = chan_rcvd_oclose1;
|
|
|
|
chan_read_failed = chan_read_failed_12;
|
|
|
|
chan_ibuf_empty = chan_ibuf_empty1;
|
|
|
|
|
|
|
|
chan_rcvd_ieof = chan_rcvd_ieof1;
|
|
|
|
chan_write_failed = chan_write_failed1;
|
|
|
|
chan_obuf_empty = chan_obuf_empty1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* helper */
|
|
|
|
static void
|
|
|
|
chan_shutdown_write(Channel *c)
|
|
|
|
{
|
|
|
|
buffer_consume(&c->output, buffer_len(&c->output));
|
|
|
|
if (compat20 && c->type == SSH_CHANNEL_LARVAL)
|
|
|
|
return;
|
|
|
|
/* shutdown failure is allowed if write failed already */
|
|
|
|
debug("channel %d: close_write", c->self);
|
|
|
|
if (c->sock != -1) {
|
|
|
|
if (shutdown(c->sock, SHUT_WR) < 0)
|
|
|
|
debug("channel %d: chan_shutdown_write: shutdown() failed for fd%d: %.100s",
|
|
|
|
c->self, c->sock, strerror(errno));
|
|
|
|
} else {
|
|
|
|
if (close(c->wfd) < 0)
|
|
|
|
log("channel %d: chan_shutdown_write: close() failed for fd%d: %.100s",
|
|
|
|
c->self, c->wfd, strerror(errno));
|
|
|
|
c->wfd = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
static void
|
|
|
|
chan_shutdown_read(Channel *c)
|
|
|
|
{
|
|
|
|
if (compat20 && c->type == SSH_CHANNEL_LARVAL)
|
|
|
|
return;
|
|
|
|
debug("channel %d: close_read", c->self);
|
|
|
|
if (c->sock != -1) {
|
2001-02-05 12:42:17 +00:00
|
|
|
/*
|
2000-08-07 05:47:48 +00:00
|
|
|
* shutdown(sock, SHUT_READ) may return ENOTCONN if the
|
|
|
|
* write side has been closed already. (bug on Linux)
|
|
|
|
*/
|
|
|
|
if (shutdown(c->sock, SHUT_RD) < 0
|
|
|
|
&& (errno != ENOTCONN
|
|
|
|
|| c->ostate == CHAN_OUTPUT_OPEN
|
|
|
|
|| c->ostate == CHAN_OUTPUT_WAIT_DRAIN))
|
2000-04-04 04:38:59 +00:00
|
|
|
error("channel %d: chan_shutdown_read: shutdown() failed for fd%d [i%d o%d]: %.100s",
|
|
|
|
c->self, c->sock, c->istate, c->ostate, strerror(errno));
|
|
|
|
} else {
|
|
|
|
if (close(c->rfd) < 0)
|
|
|
|
log("channel %d: chan_shutdown_read: close() failed for fd%d: %.100s",
|
|
|
|
c->self, c->rfd, strerror(errno));
|
|
|
|
c->rfd = -1;
|
|
|
|
}
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|