X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/32874aeac8dacbca26663777b39a79efc5d8dc4b..86916870d36cb70e7ef0ea760e75a6ae8b2d83a5:/rlogin.c diff --git a/rlogin.c b/rlogin.c index 688c1594..afc3d2c3 100644 --- a/rlogin.c +++ b/rlogin.c @@ -1,4 +1,3 @@ -#include #include #include #include @@ -12,41 +11,52 @@ #define TRUE 1 #endif -static Socket s = NULL; +#define RLOGIN_MAX_BACKLOG 4096 -static void rlogin_size(void); +typedef struct rlogin_tag { + const struct plug_function_table *fn; + /* the above field _must_ be first in the structure */ -static int sb_opt, sb_len; -static char *sb_buf = NULL; -static int sb_size = 0; -#define SB_DELTA 1024 + Socket s; + int bufsize; + int term_width, term_height; + void *frontend; +} *Rlogin; -static void c_write(char *buf, int len) +static void rlogin_size(void *handle, int width, int height); + +static void c_write(Rlogin rlogin, char *buf, int len) { - from_backend(0, buf, len); + int backlog = from_backend(rlogin->frontend, 0, buf, len); + sk_set_frozen(rlogin->s, backlog > RLOGIN_MAX_BACKLOG); } static int rlogin_closing(Plug plug, char *error_msg, int error_code, int calling_back) { - sk_close(s); - s = NULL; + Rlogin rlogin = (Rlogin) plug; + if (rlogin->s) { + sk_close(rlogin->s); + rlogin->s = NULL; + } if (error_msg) { /* A socket error has occurred. */ - connection_fatal(error_msg); + logevent(rlogin->frontend, error_msg); + connection_fatal("%s", error_msg); } /* Otherwise, the remote side closed the connection normally. */ return 0; } static int rlogin_receive(Plug plug, int urgent, char *data, int len) { + Rlogin rlogin = (Rlogin) plug; if (urgent == 2) { char c; c = *data++; len--; if (c == '\x80') - rlogin_size(); + rlogin_size(rlogin, rlogin->term_width, rlogin->term_height); /* * We should flush everything (aka Telnet SYNCH) if we see * 0x02, and we should turn off and on _local_ flow control @@ -67,33 +77,58 @@ static int rlogin_receive(Plug plug, int urgent, char *data, int len) } firstbyte = 0; } - c_write(data, len); + if (len > 0) + c_write(rlogin, data, len); } return 1; } +static void rlogin_sent(Plug plug, int bufsize) +{ + Rlogin rlogin = (Rlogin) plug; + rlogin->bufsize = bufsize; +} + /* * Called to set up the rlogin connection. * * Returns an error message, or NULL on success. * - * Also places the canonical host name into `realhost'. + * Also places the canonical host name into `realhost'. It must be + * freed by the caller. */ -static char *rlogin_init(char *host, int port, char **realhost) +static char *rlogin_init(void *frontend_handle, void **backend_handle, + Config *cfg, + char *host, int port, char **realhost, int nodelay) { - static struct plug_function_table fn_table = { + static const struct plug_function_table fn_table = { rlogin_closing, - rlogin_receive - }, *fn_table_ptr = &fn_table; - + rlogin_receive, + rlogin_sent + }; SockAddr addr; char *err; + Rlogin rlogin; + + rlogin = smalloc(sizeof(*rlogin)); + rlogin->fn = &fn_table; + rlogin->s = NULL; + rlogin->frontend = frontend_handle; + rlogin->term_width = cfg->width; + rlogin->term_height = cfg->height; + *backend_handle = rlogin; /* * Try to find host. */ - addr = sk_namelookup(host, realhost); - if ((err = sk_addr_error(addr))) + { + char *buf; + buf = dupprintf("Looking up host \"%s\"", host); + logevent(rlogin->frontend, buf); + sfree(buf); + } + addr = name_lookup(host, port, realhost); + if ((err = sk_addr_error(addr)) != NULL) return err; if (port < 0) @@ -102,8 +137,16 @@ static char *rlogin_init(char *host, int port, char **realhost) /* * Open socket. */ - s = sk_new(addr, port, 1, 0, &fn_table_ptr); - if ((err = sk_socket_error(s))) + { + char *buf, addrbuf[100]; + sk_getaddr(addr, addrbuf, 100); + buf = dupprintf("Connecting to %s port %d", addrbuf, port); + logevent(rlogin->frontend, buf); + sfree(buf); + } + rlogin->s = new_connection(addr, *realhost, port, 1, 0, + nodelay, (Plug) rlogin); + if ((err = sk_socket_error(rlogin->s)) != NULL) return err; sk_addr_free(addr); @@ -115,79 +158,140 @@ static char *rlogin_init(char *host, int port, char **realhost) { char z = 0; char *p; - sk_write(s, &z, 1); - sk_write(s, cfg.localusername, strlen(cfg.localusername)); - sk_write(s, &z, 1); - sk_write(s, cfg.username, strlen(cfg.username)); - sk_write(s, &z, 1); - sk_write(s, cfg.termtype, strlen(cfg.termtype)); - sk_write(s, "/", 1); - for (p = cfg.termspeed; isdigit(*p); p++); - sk_write(s, cfg.termspeed, p - cfg.termspeed); - sk_write(s, &z, 1); + sk_write(rlogin->s, &z, 1); + sk_write(rlogin->s, cfg->localusername, + strlen(cfg->localusername)); + sk_write(rlogin->s, &z, 1); + sk_write(rlogin->s, cfg->username, + strlen(cfg->username)); + sk_write(rlogin->s, &z, 1); + sk_write(rlogin->s, cfg->termtype, + strlen(cfg->termtype)); + sk_write(rlogin->s, "/", 1); + for (p = cfg->termspeed; isdigit(*p); p++) continue; + sk_write(rlogin->s, cfg->termspeed, p - cfg->termspeed); + rlogin->bufsize = sk_write(rlogin->s, &z, 1); } return NULL; } /* + * Stub routine (we don't have any need to reconfigure this backend). + */ +static void rlogin_reconfig(void *handle, Config *cfg) +{ +} + +/* * Called to send data down the rlogin connection. */ -static void rlogin_send(char *buf, int len) +static int rlogin_send(void *handle, char *buf, int len) { + Rlogin rlogin = (Rlogin) handle; - if (s == NULL) - return; + if (rlogin->s == NULL) + return 0; + + rlogin->bufsize = sk_write(rlogin->s, buf, len); - sk_write(s, buf, len); + return rlogin->bufsize; +} + +/* + * Called to query the current socket sendability status. + */ +static int rlogin_sendbuffer(void *handle) +{ + Rlogin rlogin = (Rlogin) handle; + return rlogin->bufsize; } /* * Called to set the size of the window */ -static void rlogin_size(void) +static void rlogin_size(void *handle, int width, int height) { + Rlogin rlogin = (Rlogin) handle; char b[12] = { '\xFF', '\xFF', 0x73, 0x73, 0, 0, 0, 0, 0, 0, 0, 0 }; - b[6] = cols >> 8; - b[7] = cols & 0xFF; - b[4] = rows >> 8; - b[5] = rows & 0xFF; - sk_write(s, b, 12); + rlogin->term_width = width; + rlogin->term_height = height; + + if (rlogin->s == NULL) + return; + + b[6] = rlogin->term_width >> 8; + b[7] = rlogin->term_width & 0xFF; + b[4] = rlogin->term_height >> 8; + b[5] = rlogin->term_height & 0xFF; + rlogin->bufsize = sk_write(rlogin->s, b, 12); return; } /* * Send rlogin special codes. */ -static void rlogin_special(Telnet_Special code) +static void rlogin_special(void *handle, Telnet_Special code) { /* Do nothing! */ return; } -static Socket rlogin_socket(void) +static Socket rlogin_socket(void *handle) { - return s; + Rlogin rlogin = (Rlogin) handle; + return rlogin->s; } -static int rlogin_sendok(void) +static int rlogin_sendok(void *handle) { + /* Rlogin rlogin = (Rlogin) handle; */ return 1; } -static int rlogin_ldisc(int option) +static void rlogin_unthrottle(void *handle, int backlog) +{ + Rlogin rlogin = (Rlogin) handle; + sk_set_frozen(rlogin->s, backlog > RLOGIN_MAX_BACKLOG); +} + +static int rlogin_ldisc(void *handle, int option) +{ + /* Rlogin rlogin = (Rlogin) handle; */ + return 0; +} + +static void rlogin_provide_ldisc(void *handle, void *ldisc) +{ + /* This is a stub. */ +} + +static void rlogin_provide_logctx(void *handle, void *logctx) +{ + /* This is a stub. */ +} + +static int rlogin_exitcode(void *handle) { + /* Rlogin rlogin = (Rlogin) handle; */ + /* If we ever implement RSH, we'll probably need to do this properly */ return 0; } Backend rlogin_backend = { rlogin_init, + rlogin_reconfig, rlogin_send, + rlogin_sendbuffer, rlogin_size, rlogin_special, rlogin_socket, + rlogin_exitcode, rlogin_sendok, rlogin_ldisc, + rlogin_provide_ldisc, + rlogin_provide_logctx, + rlogin_unthrottle, 1 };