=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/channels.h,v retrieving revision 1.12.2.5 retrieving revision 1.13 diff -u -r1.12.2.5 -r1.13 --- src/usr.bin/ssh/channels.h 2001/03/21 18:52:40 1.12.2.5 +++ src/usr.bin/ssh/channels.h 2000/05/30 17:23:37 1.13 @@ -1,44 +1,8 @@ -/* - * Author: Tatu Ylonen - * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland - * All rights reserved - * - * As far as I am concerned, the code I have written for this software - * can be used freely for any purpose. Any derived versions of this - * software must be clearly marked as such, and if the derived work is - * incompatible with the protocol description in the RFC file, it must be - * called by a name other than "ssh" or "Secure Shell". - */ -/* - * Copyright (c) 2000 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. - */ -/* RCSID("$OpenBSD: channels.h,v 1.12.2.5 2001/03/21 18:52:40 jason Exp $"); */ +/* RCSID("$Id: channels.h,v 1.13 2000/05/30 17:23:37 markus Exp $"); */ #ifndef CHANNELS_H #define CHANNELS_H -#include "buffer.h" - /* Definitions for channel types. */ #define SSH_CHANNEL_FREE 0 /* This channel is free (unused). */ #define SSH_CHANNEL_X11_LISTENER 1 /* Listening for inet X11 conn. */ @@ -51,21 +15,15 @@ #define SSH_CHANNEL_INPUT_DRAINING 8 /* sending remaining data to conn */ #define SSH_CHANNEL_OUTPUT_DRAINING 9 /* sending remaining data to app */ #define SSH_CHANNEL_LARVAL 10 /* larval session */ -#define SSH_CHANNEL_RPORT_LISTENER 11 /* Listening to a R-style port */ -#define SSH_CHANNEL_CONNECTING 12 -#define SSH_CHANNEL_MAX_TYPE 13 +#define SSH_CHANNEL_MAX_TYPE 11 /* * Data structure for channel data. This is iniailized in channel_allocate * and cleared in channel_free. */ -struct Channel; -typedef struct Channel Channel; - typedef void channel_callback_fn(int id, void *arg); -typedef int channel_filter_fn(struct Channel *c, char *buf, int len); -struct Channel { +typedef struct Channel { int type; /* channel type/state */ int self; /* my own channel identifier */ int remote_id; /* channel identifier for remote peer */ @@ -77,7 +35,6 @@ int wfd; /* write fd */ int efd; /* extended fd */ int sock; /* sock fd */ - int isatty; /* rfd is a tty */ Buffer input; /* data read from socket, to be sent over * encrypted connection */ Buffer output; /* data received over encrypted connection for @@ -104,55 +61,38 @@ void *cb_arg; int cb_event; channel_callback_fn *dettach_user; +} Channel; - /* filter */ - channel_filter_fn *input_filter; -}; - #define CHAN_EXTENDED_IGNORE 0 #define CHAN_EXTENDED_READ 1 #define CHAN_EXTENDED_WRITE 2 -/* default window/packet sizes for tcp/x11-fwd-channel */ -#define CHAN_SES_WINDOW_DEFAULT (32*1024) -#define CHAN_SES_PACKET_DEFAULT (CHAN_SES_WINDOW_DEFAULT/2) -#define CHAN_TCP_WINDOW_DEFAULT (32*1024) -#define CHAN_TCP_PACKET_DEFAULT (CHAN_TCP_WINDOW_DEFAULT/2) -#define CHAN_X11_WINDOW_DEFAULT (4*1024) -#define CHAN_X11_PACKET_DEFAULT (CHAN_X11_WINDOW_DEFAULT/2) - - +void channel_set_fds(int id, int rfd, int wfd, int efd, int extusage); void channel_open(int id); void channel_request(int id, char *service, int wantconfirm); void channel_request_start(int id, char *service, int wantconfirm); void channel_register_callback(int id, int mtype, channel_callback_fn *fn, void *arg); void channel_register_cleanup(int id, channel_callback_fn *fn); -void channel_register_filter(int id, channel_filter_fn *fn); void channel_cancel_cleanup(int id); Channel *channel_lookup(int id); int channel_new(char *ctype, int type, int rfd, int wfd, int efd, - int window, int maxpack, int extended_usage, char *remote_name, - int nonblock); -void -channel_set_fds(int id, int rfd, int wfd, int efd, - int extusage, int nonblock); + int window, int maxpack, int extended_usage, char *remote_name); -void deny_input_open(int type, int plen, void *ctxt); +void channel_input_channel_request(int type, int plen); +void channel_input_close(int type, int plen); +void channel_input_close_confirmation(int type, int plen); +void channel_input_data(int type, int plen); +void channel_input_extended_data(int type, int plen); +void channel_input_ieof(int type, int plen); +void channel_input_oclose(int type, int plen); +void channel_input_open_confirmation(int type, int plen); +void channel_input_open_failure(int type, int plen); +void channel_input_port_open(int type, int plen); +void channel_input_window_adjust(int type, int plen); +void channel_input_open(int type, int plen); -void channel_input_channel_request(int type, int plen, void *ctxt); -void channel_input_close(int type, int plen, void *ctxt); -void channel_input_close_confirmation(int type, int plen, void *ctxt); -void channel_input_data(int type, int plen, void *ctxt); -void channel_input_extended_data(int type, int plen, void *ctxt); -void channel_input_ieof(int type, int plen, void *ctxt); -void channel_input_oclose(int type, int plen, void *ctxt); -void channel_input_open_confirmation(int type, int plen, void *ctxt); -void channel_input_open_failure(int type, int plen, void *ctxt); -void channel_input_port_open(int type, int plen, void *ctxt); -void channel_input_window_adjust(int type, int plen, void *ctxt); - /* Sets specific protocol options. */ void channel_set_options(int hostname_in_open); @@ -166,12 +106,8 @@ /* Free the channel and close its socket. */ void channel_free(int channel); -/* - * Allocate/update select bitmasks and add any bits relevant to channels in - * select bitmasks. - */ -void -channel_prepare_select(fd_set **readsetp, fd_set **writesetp, int *maxfdp); +/* Add any bits relevant to channels in select bitmasks. */ +void channel_prepare_select(fd_set * readset, fd_set * writeset); /* * After select, perform any appropriate operations for channels which have @@ -195,6 +131,9 @@ */ void channel_close_all(void); +/* Returns the maximum file descriptor number used by the channels. */ +int channel_max_fd(void); + /* Returns true if there is still an open channel over the connection. */ int channel_still_open(void); @@ -207,15 +146,12 @@ /* * Initiate forwarding of connections to local port "port" through the secure - * channel to host:port from remote side. + * channel to host:port from remote side. This never returns if there was an + * error. */ -int -channel_request_local_forwarding(u_short listen_port, - const char *host_to_connect, u_short port_to_connect, int gateway_ports); -int -channel_request_forwarding(const char *listen_address, u_short listen_port, - const char *host_to_connect, u_short port_to_connect, int gateway_ports, - int remote_fwd); +void +channel_request_local_forwarding(u_short port, const char *host, + u_short remote_port, int gateway_ports); /* * Initiate forwarding of connections to port "port" on remote host through @@ -228,18 +164,12 @@ u_short remote_port); /* - * Permits opening to any host/port if permitted_opens[] is empty. This is - * usually called by the server, because the user could connect to any port - * anyway, and the server has no way to know but to trust the client anyway. + * Permits opening to any host/port in SSH_MSG_PORT_OPEN. This is usually + * called by the server, because the user could connect to any port anyway, + * and the server has no way to know but to trust the client anyway. */ void channel_permit_all_opens(void); -/* Add host/port to list of allowed targets for port forwarding */ -void channel_add_permitted_opens(char *host, int port); - -/* Flush list */ -void channel_clear_permitted_opens(void); - /* * This is called after receiving CHANNEL_FORWARDING_REQUEST. This initates * listening for the port, and sends back a success reply (or disconnect @@ -265,7 +195,7 @@ * the remote channel number. We should do whatever we want, and respond * with either SSH_MSG_OPEN_CONFIRMATION or SSH_MSG_OPEN_FAILURE. */ -void x11_input_open(int type, int plen, void *ctxt); +void x11_input_open(int type, int plen); /* * Requests forwarding of X11 connections. This should be called on the @@ -298,11 +228,10 @@ int auth_input_request_forwarding(struct passwd * pw); /* This is called to process an SSH_SMSG_AGENT_OPEN message. */ -void auth_input_open_request(int type, int plen, void *ctxt); +void auth_input_open_request(int type, int plen); /* XXX */ int channel_connect_to(const char *host, u_short host_port); -int channel_connect_by_listen_adress(u_short listen_port); int x11_connect_display(void); #endif