X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=rlogin.c;h=eba468da235a8689f83753a4b1c8235edc538dab;hb=7a0a404eb8e79d8e5de740a06a08824cc918d4c8;hp=6841fc6e64512fd1d60acfddd08b8840a8510835;hpb=b22bdb2b0d4bc49ff894658872b8940b89f3153c;p=PuTTY.git diff --git a/rlogin.c b/rlogin.c index 6841fc6e..eba468da 100644 --- a/rlogin.c +++ b/rlogin.c @@ -4,6 +4,7 @@ #include #include +#include #include #include "putty.h" @@ -22,13 +23,14 @@ typedef struct rlogin_tag { /* the above field _must_ be first in the structure */ Socket s; + int closed_on_socket_error; int bufsize; int firstbyte; int cansize; int term_width, term_height; void *frontend; - Config cfg; + Conf *conf; /* In case we need to read a username from the terminal before starting */ prompts_t *prompt; @@ -46,25 +48,27 @@ static void rlogin_log(Plug plug, int type, SockAddr addr, int port, const char *error_msg, int error_code) { Rlogin rlogin = (Rlogin) plug; - char addrbuf[256], *msg; - - sk_getaddr(addr, addrbuf, lenof(addrbuf)); - - if (type == 0) - msg = dupprintf("Connecting to %s port %d", addrbuf, port); - else - msg = dupprintf("Failed to connect to %s: %s", addrbuf, error_msg); - - logevent(rlogin->frontend, msg); + backend_socket_log(rlogin->frontend, type, addr, port, + error_msg, error_code, + rlogin->conf, !rlogin->firstbyte); } static int rlogin_closing(Plug plug, const char *error_msg, int error_code, int calling_back) { Rlogin rlogin = (Rlogin) plug; + + /* + * We don't implement independent EOF in each direction for Telnet + * connections; as soon as we get word that the remote side has + * sent us EOF, we wind up the whole connection. + */ + if (rlogin->s) { sk_close(rlogin->s); rlogin->s = NULL; + if (error_msg) + rlogin->closed_on_socket_error = TRUE; notify_remote_exit(rlogin->frontend); } if (error_msg) { @@ -122,18 +126,18 @@ static void rlogin_startup(Rlogin rlogin, const char *ruser) { char z = 0; char *p; + sk_write(rlogin->s, &z, 1); - sk_write(rlogin->s, rlogin->cfg.localusername, - strlen(rlogin->cfg.localusername)); + p = conf_get_str(rlogin->conf, CONF_localusername); + sk_write(rlogin->s, p, strlen(p)); sk_write(rlogin->s, &z, 1); - sk_write(rlogin->s, ruser, - strlen(ruser)); + sk_write(rlogin->s, ruser, strlen(ruser)); sk_write(rlogin->s, &z, 1); - sk_write(rlogin->s, rlogin->cfg.termtype, - strlen(rlogin->cfg.termtype)); + p = conf_get_str(rlogin->conf, CONF_termtype); + sk_write(rlogin->s, p, strlen(p)); sk_write(rlogin->s, "/", 1); - for (p = rlogin->cfg.termspeed; isdigit((unsigned char)*p); p++) continue; - sk_write(rlogin->s, rlogin->cfg.termspeed, p - rlogin->cfg.termspeed); + p = conf_get_str(rlogin->conf, CONF_termspeed); + sk_write(rlogin->s, p, strspn(p, "0123456789")); rlogin->bufsize = sk_write(rlogin->s, &z, 1); rlogin->prompt = NULL; @@ -148,8 +152,8 @@ static void rlogin_startup(Rlogin rlogin, const char *ruser) * freed by the caller. */ static const char *rlogin_init(void *frontend_handle, void **backend_handle, - Config *cfg, - char *host, int port, char **realhost, + Conf *conf, + const char *host, int port, char **realhost, int nodelay, int keepalive) { static const struct plug_function_table fn_table = { @@ -161,33 +165,29 @@ static const char *rlogin_init(void *frontend_handle, void **backend_handle, SockAddr addr; const char *err; Rlogin rlogin; - char ruser[sizeof(cfg->username)]; + char *ruser; + int addressfamily; + char *loghost; rlogin = snew(struct rlogin_tag); rlogin->fn = &fn_table; rlogin->s = NULL; + rlogin->closed_on_socket_error = FALSE; rlogin->frontend = frontend_handle; - rlogin->term_width = cfg->width; - rlogin->term_height = cfg->height; + rlogin->term_width = conf_get_int(conf, CONF_width); + rlogin->term_height = conf_get_int(conf, CONF_height); rlogin->firstbyte = 1; rlogin->cansize = 0; rlogin->prompt = NULL; - rlogin->cfg = *cfg; /* STRUCTURE COPY */ + rlogin->conf = conf_copy(conf); *backend_handle = rlogin; + addressfamily = conf_get_int(conf, CONF_addressfamily); /* * Try to find host. */ - { - char *buf; - buf = dupprintf("Looking up host \"%s\"%s", host, - (cfg->addressfamily == ADDRTYPE_IPV4 ? " (IPv4)" : - (cfg->addressfamily == ADDRTYPE_IPV6 ? " (IPv6)" : - ""))); - logevent(rlogin->frontend, buf); - sfree(buf); - } - addr = name_lookup(host, port, realhost, cfg, cfg->addressfamily); + addr = name_lookup(host, port, realhost, conf, addressfamily, + rlogin->frontend, "rlogin connection"); if ((err = sk_addr_error(addr)) != NULL) { sk_addr_free(addr); return err; @@ -200,24 +200,20 @@ static const char *rlogin_init(void *frontend_handle, void **backend_handle, * Open socket. */ rlogin->s = new_connection(addr, *realhost, port, 1, 0, - nodelay, keepalive, (Plug) rlogin, cfg); + nodelay, keepalive, (Plug) rlogin, conf); if ((err = sk_socket_error(rlogin->s)) != NULL) return err; - if (*cfg->loghost) { + loghost = conf_get_str(conf, CONF_loghost); + if (*loghost) { char *colon; sfree(*realhost); - *realhost = dupstr(cfg->loghost); - colon = strrchr(*realhost, ':'); - if (colon) { - /* - * FIXME: if we ever update this aspect of ssh.c for - * IPv6 literal management, this should change in line - * with it. - */ + *realhost = dupstr(loghost); + + colon = host_strrchr(*realhost, ':'); + if (colon) *colon++ = '\0'; - } } /* @@ -226,16 +222,16 @@ static const char *rlogin_init(void *frontend_handle, void **backend_handle, * in which case we prompt for it and may end up deferring doing * anything else until the local prompt mechanism returns. */ - if (get_remote_username(cfg, ruser, sizeof(ruser))) { + if ((ruser = get_remote_username(conf)) != NULL) { rlogin_startup(rlogin, ruser); + sfree(ruser); } else { int ret; rlogin->prompt = new_prompts(rlogin->frontend); rlogin->prompt->to_server = TRUE; rlogin->prompt->name = dupstr("Rlogin login name"); - add_prompt(rlogin->prompt, dupstr("rlogin username: "), TRUE, - sizeof(cfg->username)); + add_prompt(rlogin->prompt, dupstr("rlogin username: "), TRUE); ret = get_userpass_input(rlogin->prompt, NULL, 0); if (ret >= 0) { rlogin_startup(rlogin, rlogin->prompt->prompts[0]->result); @@ -253,20 +249,21 @@ static void rlogin_free(void *handle) free_prompts(rlogin->prompt); if (rlogin->s) sk_close(rlogin->s); + conf_free(rlogin->conf); sfree(rlogin); } /* * Stub routine (we don't have any need to reconfigure this backend). */ -static void rlogin_reconfig(void *handle, Config *cfg) +static void rlogin_reconfig(void *handle, Conf *conf) { } /* * Called to send data down the rlogin connection. */ -static int rlogin_send(void *handle, char *buf, int len) +static int rlogin_send(void *handle, const char *buf, int len) { Rlogin rlogin = (Rlogin) handle; @@ -380,6 +377,8 @@ static int rlogin_exitcode(void *handle) Rlogin rlogin = (Rlogin) handle; if (rlogin->s != NULL) return -1; /* still connected */ + else if (rlogin->closed_on_socket_error) + return INT_MAX; /* a socket error counts as an unclean exit */ else /* If we ever implement RSH, we'll probably need to do this properly */ return 0; @@ -410,6 +409,7 @@ Backend rlogin_backend = { rlogin_provide_logctx, rlogin_unthrottle, rlogin_cfg_info, + NULL /* test_for_upstream */, "rlogin", PROT_RLOGIN, 513