X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/3ad9d396e3e57477b4da4b20665ca33edd5d7f67..79bf227ba7ba02e32ac710621b672e2789f9ef50:/rlogin.c diff --git a/rlogin.c b/rlogin.c index 525d48d0..f2b61d27 100644 --- a/rlogin.c +++ b/rlogin.c @@ -1,4 +1,3 @@ -#include #include #include #include @@ -14,40 +13,51 @@ #define RLOGIN_MAX_BACKLOG 4096 -static Socket s = NULL; -static int rlogin_bufsize; +typedef struct rlogin_tag { + const struct plug_function_table *fn; + /* the above field _must_ be first in the structure */ -static void rlogin_size(void); + Socket s; + int bufsize; + int firstbyte; + 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) { - int backlog = from_backend(0, buf, len); - sk_set_frozen(s, backlog > RLOGIN_MAX_BACKLOG); + 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, +static int rlogin_closing(Plug plug, const char *error_msg, int error_code, int calling_back) { - if (s) { - 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(rlogin->frontend, "%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 @@ -60,22 +70,23 @@ static int rlogin_receive(Plug plug, int urgent, char *data, int len) * byte is expected to be NULL and is ignored, and the rest * is printed. */ - static int firstbyte = 1; - if (firstbyte) { + if (rlogin->firstbyte) { if (data[0] == '\0') { data++; len--; } - firstbyte = 0; + rlogin->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_bufsize = bufsize; + Rlogin rlogin = (Rlogin) plug; + rlogin->bufsize = bufsize; } /* @@ -86,28 +97,43 @@ static void rlogin_sent(Plug plug, int bufsize) * 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 const char *rlogin_init(void *frontend_handle, void **backend_handle, + Config *cfg, + char *host, int port, char **realhost, + int nodelay, int keepalive) { - static struct plug_function_table fn_table = { + static const struct plug_function_table fn_table = { rlogin_closing, rlogin_receive, rlogin_sent - }, *fn_table_ptr = &fn_table; - + }; SockAddr addr; - char *err; + const char *err; + Rlogin rlogin; + + rlogin = snew(struct rlogin_tag); + rlogin->fn = &fn_table; + rlogin->s = NULL; + rlogin->frontend = frontend_handle; + rlogin->term_width = cfg->width; + rlogin->term_height = cfg->height; + rlogin->firstbyte = 1; + *backend_handle = rlogin; /* * Try to find host. */ { - char buf[200]; - sprintf(buf, "Looking up host \"%.170s\"", host); - logevent(buf); + char *buf; + buf = dupprintf("Looking up host \"%s\"", host); + logevent(rlogin->frontend, buf); + sfree(buf); } - addr = sk_namelookup(host, realhost); - if ((err = sk_addr_error(addr))) + addr = name_lookup(host, port, realhost, cfg); + if ((err = sk_addr_error(addr)) != NULL) { + sk_addr_free(addr); return err; + } if (port < 0) port = 513; /* default rlogin port */ @@ -116,17 +142,17 @@ static char *rlogin_init(char *host, int port, char **realhost) * Open socket. */ { - char buf[200], addrbuf[100]; + char *buf, addrbuf[100]; sk_getaddr(addr, addrbuf, 100); - sprintf(buf, "Connecting to %.100s port %d", addrbuf, port); - logevent(buf); + buf = dupprintf("Connecting to %s port %d", addrbuf, port); + logevent(rlogin->frontend, buf); + sfree(buf); } - s = sk_new(addr, port, 1, 0, &fn_table_ptr); - if ((err = sk_socket_error(s))) + rlogin->s = new_connection(addr, *realhost, port, 1, 0, + nodelay, keepalive, (Plug) rlogin, cfg); + if ((err = sk_socket_error(rlogin->s)) != NULL) return err; - sk_addr_free(addr); - /* * Send local username, remote username, terminal/speed */ @@ -134,95 +160,163 @@ 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); - rlogin_bufsize = 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((unsigned char)*p); p++) continue; + sk_write(rlogin->s, cfg->termspeed, p - cfg->termspeed); + rlogin->bufsize = sk_write(rlogin->s, &z, 1); } return NULL; } +static void rlogin_free(void *handle) +{ + Rlogin rlogin = (Rlogin) handle; + + if (rlogin->s) + sk_close(rlogin->s); + sfree(rlogin); +} + +/* + * 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 int rlogin_send(char *buf, int len) +static int rlogin_send(void *handle, char *buf, int len) { - if (s == NULL) + Rlogin rlogin = (Rlogin) handle; + + if (rlogin->s == NULL) return 0; - rlogin_bufsize = sk_write(s, buf, len); + rlogin->bufsize = sk_write(rlogin->s, buf, len); - return rlogin_bufsize; + return rlogin->bufsize; } /* * Called to query the current socket sendability status. */ -static int rlogin_sendbuffer(void) +static int rlogin_sendbuffer(void *handle) { - return rlogin_bufsize; + 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; - rlogin_bufsize = 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) +/* + * Return a list of the special codes that make sense in this + * protocol. + */ +static const struct telnet_special *rlogin_get_specials(void *handle) +{ + return NULL; +} + +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 void rlogin_unthrottle(int backlog) +static void rlogin_unthrottle(void *handle, int backlog) { - sk_set_frozen(s, backlog > RLOGIN_MAX_BACKLOG); + Rlogin rlogin = (Rlogin) handle; + sk_set_frozen(rlogin->s, backlog > RLOGIN_MAX_BACKLOG); } -static int rlogin_ldisc(int option) +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 (rlogin->s != NULL) + return -1; /* still connected */ + else + /* If we ever implement RSH, we'll probably need to do this properly */ + return 0; +} + Backend rlogin_backend = { rlogin_init, + rlogin_free, + rlogin_reconfig, rlogin_send, rlogin_sendbuffer, rlogin_size, rlogin_special, + rlogin_get_specials, rlogin_socket, + rlogin_exitcode, rlogin_sendok, rlogin_ldisc, + rlogin_provide_ldisc, + rlogin_provide_logctx, rlogin_unthrottle, 1 };