*/
#include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.158 2002/01/09 17:26:35 markus Exp $");
+RCSID("$OpenBSD: channels.c,v 1.159 2002/01/14 13:55:55 markus Exp $");
#include "ssh.h"
#include "ssh1.h"
/* Do initial allocation if this is the first call. */
if (channels_alloc == 0) {
- chan_init();
channels_alloc = 10;
channels = xmalloc(channels_alloc * sizeof(Channel *));
for (i = 0; i < channels_alloc; i++)
buffer_init(&c->input);
buffer_init(&c->output);
buffer_init(&c->extended);
- chan_init_iostates(c);
+ c->ostate = CHAN_OUTPUT_OPEN;
+ c->istate = CHAN_INPUT_OPEN;
+ c->flags = 0;
channel_register_fds(c, rfd, wfd, efd, extusage, nonblock);
c->self = found;
c->type = type;
* (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.57 2002/01/13 21:31:20 markus Exp $"); */
+/* RCSID("$OpenBSD: channels.h,v 1.58 2002/01/14 13:55:55 markus Exp $"); */
#ifndef CHANNEL_H
#define CHANNEL_H
int chan_is_dead(Channel *, int);
void chan_mark_dead(Channel *);
-void chan_init_iostates(Channel *);
-void chan_init(void);
-typedef void chan_event_fn(Channel *);
+/* channel events */
-/* for the input state */
-extern chan_event_fn *chan_rcvd_oclose;
-extern chan_event_fn *chan_read_failed;
-extern chan_event_fn *chan_ibuf_empty;
+void chan_rcvd_oclose(Channel *);
+void chan_read_failed(Channel *);
+void chan_ibuf_empty(Channel *);
-/* for the output state */
-extern chan_event_fn *chan_rcvd_ieof;
-extern chan_event_fn *chan_write_failed;
-extern chan_event_fn *chan_obuf_empty;
+void chan_rcvd_ieof(Channel *);
+void chan_write_failed(Channel *);
+void chan_obuf_empty(Channel *);
#endif
*/
#include "includes.h"
-RCSID("$OpenBSD: nchan.c,v 1.41 2002/01/14 13:41:13 markus Exp $");
+RCSID("$OpenBSD: nchan.c,v 1.42 2002/01/14 13:55:55 markus Exp $");
#include "ssh1.h"
#include "ssh2.h"
/*
* EVENTS update channel input/output states execute ACTIONS
*/
-/* events concerning the INPUT from socket for channel (istate) */
-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
*/
return;
}
}
-static void
-chan_read_failed_12(Channel *c)
+void
+chan_read_failed(Channel *c)
{
debug("channel %d: read failed", c->self);
switch (c->istate) {
break;
}
}
-static void
-chan_ibuf_empty1(Channel *c)
+void
+chan_ibuf_empty(Channel *c)
{
debug("channel %d: ibuf empty", c->self);
if (buffer_len(&c->input)) {
break;
}
}
-static void
-chan_obuf_empty1(Channel *c)
+void
+chan_obuf_empty(Channel *c)
{
debug("channel %d: obuf empty", c->self);
if (buffer_len(&c->output)) {
}
}
static void
-chan_ibuf_empty2(Channel *c)
-{
- chan_ibuf_empty1(c);
-}
-static void
chan_rcvd_eof2(Channel *c)
{
debug("channel %d: rcvd eof", c->self);
}
}
static void
-chan_obuf_empty2(Channel *c)
-{
- chan_obuf_empty1(c);
-}
-static void
chan_send_eof2(Channel *c)
{
debug("channel %d: send eof", c->self);
/* shared */
+void
+chan_rcvd_ieof(Channel *c)
+{
+ if (compat20)
+ chan_rcvd_eof2(c);
+ else
+ chan_rcvd_ieof1(c);
+}
+void
+chan_rcvd_oclose(Channel *c)
+{
+ if (compat20)
+ chan_rcvd_close2(c);
+ else
+ chan_rcvd_oclose1(c);
+}
+void
+chan_write_failed(Channel *c)
+{
+ if (compat20)
+ chan_write_failed2(c);
+ else
+ chan_write_failed1(c);
+}
+
void
chan_mark_dead(Channel *c)
{
return 0;
}
-void
-chan_init_iostates(Channel *c)
-{
- c->ostate = CHAN_OUTPUT_OPEN;
- c->istate = CHAN_INPUT_OPEN;
- c->flags = 0;
-}
-
-/* init */
-void
-chan_init(void)
-{
- if (compat20) {
- chan_rcvd_oclose = chan_rcvd_close2;
- chan_read_failed = chan_read_failed_12;
- chan_ibuf_empty = chan_ibuf_empty2;
-
- chan_rcvd_ieof = chan_rcvd_eof2;
- 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)