RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2001/05/28 23:14:49 

[channels.c channels.h nchan.c]
     undo broken channel fix and try a different one. there
     should be still some select errors...
This commit is contained in:
Ben Lindstrom 2001-06-05 20:52:50 +00:00
parent a3828d4812
commit c0dee1a148
4 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -65,6 +65,10 @@
- markus@cvs.openbsd.org 2001/05/28 22:51:11 - markus@cvs.openbsd.org 2001/05/28 22:51:11
[cipher.c cipher.h] [cipher.c cipher.h]
simpler 3des for ssh1 simpler 3des for ssh1
- markus@cvs.openbsd.org 2001/05/28 23:14:49
[channels.c channels.h nchan.c]
undo broken channel fix and try a different one. there
should be still some select errors...
20010528 20010528
- (tim) [conifgure.in] add setvbuf test needed for sftp-int.c - (tim) [conifgure.in] add setvbuf test needed for sftp-int.c
@ -5495,4 +5499,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1242 2001/06/05 20:50:16 mouring Exp $ $Id: ChangeLog,v 1.1243 2001/06/05 20:52:50 mouring Exp $

28
channels.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: channels.c,v 1.117 2001/05/19 19:57:09 stevesk Exp $"); RCSID("$OpenBSD: channels.c,v 1.118 2001/05/28 23:14:49 markus Exp $");
#include <openssl/rsa.h> #include <openssl/rsa.h>
#include <openssl/dsa.h> #include <openssl/dsa.h>
@ -280,6 +280,9 @@ channel_new(char *ctype, int type, int rfd, int wfd, int efd,
void void
channel_close_fds(Channel *c) channel_close_fds(Channel *c)
{ {
debug3("channel_close_fds: channel %d: r %d w %d e %d",
c->self, c->rfd, c->wfd, c->efd);
if (c->sock != -1) { if (c->sock != -1) {
close(c->sock); close(c->sock);
c->sock = -1; c->sock = -1;
@ -304,9 +307,17 @@ void
channel_free(Channel *c) channel_free(Channel *c)
{ {
char *s; char *s;
int i, n;
for (n = 0, i = 0; i < channels_alloc; i++)
if (channels[i])
n++;
debug("channel_free: channel %d: (%s) nchannels: %d", c->self,
c->remote_name ? c->remote_name : "???", n);
s = channel_open_message(); s = channel_open_message();
debug("channel_free: channel %d: status: %s", c->self, s); debug3("channel_free: status: %s", c->self, s);
xfree(s); xfree(s);
if (c->dettach_user != NULL) { if (c->dettach_user != NULL) {
@ -893,7 +904,7 @@ channel_handle_rfd(Channel *c, fd_set * readset, fd_set * writeset)
char buf[16*1024]; char buf[16*1024];
int len; int len;
if (c->istate == CHAN_INPUT_OPEN && if (c->rfd != -1 &&
FD_ISSET(c->rfd, readset)) { FD_ISSET(c->rfd, readset)) {
len = read(c->rfd, buf, sizeof(buf)); len = read(c->rfd, buf, sizeof(buf));
if (len < 0 && (errno == EINTR || errno == EAGAIN)) if (len < 0 && (errno == EINTR || errno == EAGAIN))
@ -932,8 +943,7 @@ channel_handle_wfd(Channel *c, fd_set * readset, fd_set * writeset)
int len; int len;
/* Send buffered output data to the socket. */ /* Send buffered output data to the socket. */
if ((c->ostate == CHAN_OUTPUT_OPEN || if (c->wfd != -1 &&
c->ostate == CHAN_OUTPUT_WAIT_DRAIN) &&
FD_ISSET(c->wfd, writeset) && FD_ISSET(c->wfd, writeset) &&
buffer_len(&c->output) > 0) { buffer_len(&c->output) > 0) {
len = write(c->wfd, buffer_ptr(&c->output), len = write(c->wfd, buffer_ptr(&c->output),
@ -1164,9 +1174,8 @@ channel_handler(chan_fn *ftab[], fd_set * readset, fd_set * writeset)
c = channels[i]; c = channels[i];
if (c == NULL) if (c == NULL)
continue; continue;
if (ftab[c->type] == NULL) if (ftab[c->type] != NULL)
continue; (*ftab[c->type])(c, readset, writeset);
(*ftab[c->type])(c, readset, writeset);
if (chan_is_dead(c)) { if (chan_is_dead(c)) {
/* /*
* we have to remove the fd's from the select mask * we have to remove the fd's from the select mask
@ -1715,6 +1724,7 @@ channel_still_open()
case SSH_CHANNEL_AUTH_SOCKET: case SSH_CHANNEL_AUTH_SOCKET:
case SSH_CHANNEL_DYNAMIC: case SSH_CHANNEL_DYNAMIC:
case SSH_CHANNEL_CONNECTING: case SSH_CHANNEL_CONNECTING:
case SSH_CHANNEL_ZOMBIE:
continue; continue;
case SSH_CHANNEL_LARVAL: case SSH_CHANNEL_LARVAL:
if (!compat20) if (!compat20)
@ -1757,6 +1767,7 @@ channel_find_open()
case SSH_CHANNEL_RPORT_LISTENER: case SSH_CHANNEL_RPORT_LISTENER:
case SSH_CHANNEL_OPENING: case SSH_CHANNEL_OPENING:
case SSH_CHANNEL_CONNECTING: case SSH_CHANNEL_CONNECTING:
case SSH_CHANNEL_ZOMBIE:
continue; continue;
case SSH_CHANNEL_LARVAL: case SSH_CHANNEL_LARVAL:
case SSH_CHANNEL_AUTH_SOCKET: case SSH_CHANNEL_AUTH_SOCKET:
@ -1804,6 +1815,7 @@ channel_open_message()
case SSH_CHANNEL_RPORT_LISTENER: case SSH_CHANNEL_RPORT_LISTENER:
case SSH_CHANNEL_CLOSED: case SSH_CHANNEL_CLOSED:
case SSH_CHANNEL_AUTH_SOCKET: case SSH_CHANNEL_AUTH_SOCKET:
case SSH_CHANNEL_ZOMBIE:
continue; continue;
case SSH_CHANNEL_LARVAL: case SSH_CHANNEL_LARVAL:
case SSH_CHANNEL_OPENING: case SSH_CHANNEL_OPENING:

5
channels.h
View File

@ -32,7 +32,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
/* RCSID("$OpenBSD: channels.h,v 1.32 2001/05/04 23:47:33 markus Exp $"); */ /* RCSID("$OpenBSD: channels.h,v 1.33 2001/05/28 23:14:49 markus Exp $"); */
#ifndef CHANNELS_H #ifndef CHANNELS_H
#define CHANNELS_H #define CHANNELS_H
@ -53,7 +53,8 @@
#define SSH_CHANNEL_RPORT_LISTENER 11 /* Listening to a R-style port */ #define SSH_CHANNEL_RPORT_LISTENER 11 /* Listening to a R-style port */
#define SSH_CHANNEL_CONNECTING 12 #define SSH_CHANNEL_CONNECTING 12
#define SSH_CHANNEL_DYNAMIC 13 #define SSH_CHANNEL_DYNAMIC 13
#define SSH_CHANNEL_MAX_TYPE 14 #define SSH_CHANNEL_ZOMBIE 14 /* Almost dead. */
#define SSH_CHANNEL_MAX_TYPE 15
#define SSH_CHANNEL_PATH_LEN 30 #define SSH_CHANNEL_PATH_LEN 30

10
nchan.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: nchan.c,v 1.25 2001/05/16 22:09:21 markus Exp $"); RCSID("$OpenBSD: nchan.c,v 1.26 2001/05/28 23:14:49 markus Exp $");
#include "ssh1.h" #include "ssh1.h"
#include "ssh2.h" #include "ssh2.h"
@ -394,14 +394,16 @@ chan_send_close2(Channel *c)
void void
chan_mark_dead(Channel *c) chan_mark_dead(Channel *c)
{ {
c->flags |= CHAN_DEAD; c->type = SSH_CHANNEL_ZOMBIE;
} }
int int
chan_is_dead(Channel *c) chan_is_dead(Channel *c)
{ {
if (c->flags & CHAN_DEAD) if (c->type == SSH_CHANNEL_ZOMBIE) {
debug("channel %d: zombie", c->self);
return 1; return 1;
}
if (c->istate != CHAN_INPUT_CLOSED || c->ostate != CHAN_OUTPUT_CLOSED) if (c->istate != CHAN_INPUT_CLOSED || c->ostate != CHAN_OUTPUT_CLOSED)
return 0; return 0;
if (!compat20) { if (!compat20) {
@ -484,6 +486,7 @@ chan_shutdown_write(Channel *c)
if (close(c->wfd) < 0) if (close(c->wfd) < 0)
log("channel %d: chan_shutdown_write: close() failed for fd%d: %.100s", log("channel %d: chan_shutdown_write: close() failed for fd%d: %.100s",
c->self, c->wfd, strerror(errno)); c->self, c->wfd, strerror(errno));
c->wfd = -1;
} }
} }
static void static void
@ -506,5 +509,6 @@ chan_shutdown_read(Channel *c)
if (close(c->rfd) < 0) if (close(c->rfd) < 0)
log("channel %d: chan_shutdown_read: close() failed for fd%d: %.100s", log("channel %d: chan_shutdown_read: close() failed for fd%d: %.100s",
c->self, c->rfd, strerror(errno)); c->self, c->rfd, strerror(errno));
c->rfd = -1;
} }
} }