From b38eff8e4ff901df9cf1113a9f14d64c3565a401 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sat, 1 Apr 2000 11:09:21 +1000 Subject: - Big OpenBSD CVS update (mainly beginnings of SSH2 infrastructure) - [auth.c session.c sshd.c auth.h] split sshd.c -> auth.c session.c sshd.c plus cleanup and goto-removal - [bufaux.c bufaux.h] support ssh2 bignums - [channels.c channels.h clientloop.c sshd.c nchan.c nchan.h packet.c] [readconf.c ssh.c ssh.h serverloop.c] replace big switch() with function tables (prepare for ssh2) - [ssh2.h] ssh2 message type codes - [sshd.8] reorder Xr to avoid cutting - [serverloop.c] close(fdin) if fdin != fdout, shutdown otherwise, ok theo@ - [channels.c] missing close allow bigger packets - [cipher.c cipher.h] support ssh2 ciphers - [compress.c] cleanup, less code - [dispatch.c dispatch.h] function tables for different message types - [log-server.c] do not log() if debuggin to stderr rename a cpp symbol, to avoid param.h collision - [mpaux.c] KNF - [nchan.c] sync w/ channels.c --- nchan.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'nchan.c') diff --git a/nchan.c b/nchan.c index 0c8066f87..996623fb4 100644 --- a/nchan.c +++ b/nchan.c @@ -28,7 +28,7 @@ */ #include "includes.h" -RCSID("$Id: nchan.c,v 1.5 2000/01/14 04:45:50 damien Exp $"); +RCSID("$Id: nchan.c,v 1.6 2000/04/01 01:09:24 damien Exp $"); #include "ssh.h" @@ -41,7 +41,6 @@ static void chan_send_ieof(Channel *c); static void chan_send_oclose(Channel *c); static void chan_shutdown_write(Channel *c); static void chan_shutdown_read(Channel *c); -static void chan_delete_if_full_closed(Channel *c); /* * EVENTS update channel input/output states execute ACTIONS @@ -73,7 +72,6 @@ chan_rcvd_oclose(Channel *c) error("protocol error: chan_rcvd_oclose %d for istate %d", c->self, c->istate); return; } - chan_delete_if_full_closed(c); } void chan_read_failed(Channel *c) @@ -121,7 +119,6 @@ chan_rcvd_ieof(Channel *c) case CHAN_OUTPUT_WAIT_IEOF: debug("channel %d: OUTPUT_WAIT_IEOF -> OUTPUT_CLOSED [rvcd IEOF]", c->self); c->ostate = CHAN_OUTPUT_CLOSED; - chan_delete_if_full_closed(c); break; default: error("protocol error: chan_rcvd_ieof %d for ostate %d", c->self, c->ostate); @@ -141,7 +138,6 @@ chan_write_failed(Channel *c) debug("channel %d: OUTPUT_WAIT_DRAIN -> OUTPUT_CLOSED [write failed]", c->self); chan_send_oclose(c); c->ostate = CHAN_OUTPUT_CLOSED; - chan_delete_if_full_closed(c); break; default: error("internal error: chan_write_failed %d for ostate %d", c->self, c->ostate); @@ -160,7 +156,6 @@ chan_obuf_empty(Channel *c) debug("channel %d: OUTPUT_WAIT_DRAIN -> OUTPUT_CLOSED [obuf empty, send OCLOSE]", c->self); chan_send_oclose(c); c->ostate = CHAN_OUTPUT_CLOSED; - chan_delete_if_full_closed(c); break; default: error("internal error: chan_obuf_empty %d for ostate %d", c->self, c->ostate); @@ -222,7 +217,7 @@ chan_shutdown_read(Channel *c) error("chan_shutdown_read failed for #%d/fd%d [i%d o%d]: %.100s", c->self, c->sock, c->istate, c->ostate, strerror(errno)); } -static void +void chan_delete_if_full_closed(Channel *c) { if (c->istate == CHAN_INPUT_CLOSED && c->ostate == CHAN_OUTPUT_CLOSED) { -- cgit v1.2.3