X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/ef41972cded2d909fb1a0909b39a0a02f2fbee01..055817455466c8eb60392f30bb7c689763962e17:/telnet.c diff --git a/telnet.c b/telnet.c index 592a2bba..6789e5de 100644 --- a/telnet.c +++ b/telnet.c @@ -72,6 +72,19 @@ #define TELOPT_AUTHENTICATION 37 /* Authenticate */ #define TELOPT_ENCRYPT 38 /* Encryption option */ #define TELOPT_NEW_ENVIRON 39 /* New - Environment variables */ +#define TELOPT_TN3270E 40 /* TN3270 enhancements */ +#define TELOPT_XAUTH 41 +#define TELOPT_CHARSET 42 /* Character set */ +#define TELOPT_RSP 43 /* Remote serial port */ +#define TELOPT_COM_PORT_OPTION 44 /* Com port control */ +#define TELOPT_SLE 45 /* Suppress local echo */ +#define TELOPT_STARTTLS 46 /* Start TLS */ +#define TELOPT_KERMIT 47 /* Automatic Kermit file transfer */ +#define TELOPT_SEND_URL 48 +#define TELOPT_FORWARD_X 49 +#define TELOPT_PRAGMA_LOGON 138 +#define TELOPT_SSPI_LOGON 139 +#define TELOPT_PRAGMA_HEARTBEAT 140 #define TELOPT_EXOPL 255 /* extended-options-list */ #define TELQUAL_IS 0 /* option is... */ @@ -132,6 +145,19 @@ static char *telopt(int opt) i(AUTHENTICATION); i(ENCRYPT); i(NEW_ENVIRON); + i(TN3270E); + i(XAUTH); + i(CHARSET); + i(RSP); + i(COM_PORT_OPTION); + i(SLE); + i(STARTTLS); + i(KERMIT); + i(SEND_URL); + i(FORWARD_X); + i(PRAGMA_LOGON); + i(SSPI_LOGON); + i(PRAGMA_HEARTBEAT); i(EXOPL); #undef i return ""; @@ -209,7 +235,7 @@ typedef struct telnet_tag { int bufsize; int in_synch; int sb_opt, sb_len; - char *sb_buf; + unsigned char *sb_buf; int sb_size; enum { @@ -217,6 +243,9 @@ typedef struct telnet_tag { SEENSB, SUBNEGOT, SUBNEG_IAC, SEENCR } state; + Config cfg; + + Pinger pinger; } *Telnet; #define TELNET_MAX_BACKLOG 4096 @@ -254,7 +283,7 @@ static void send_opt(Telnet telnet, int cmd, int option) b[0] = IAC; b[1] = cmd; b[2] = option; - telnet->bufsize = sk_write(telnet->s, b, 3); + telnet->bufsize = sk_write(telnet->s, (char *)b, 3); log_option(telnet, "client", cmd, option); } @@ -386,13 +415,13 @@ static void process_subneg(Telnet telnet) b[1] = SB; b[2] = TELOPT_TSPEED; b[3] = TELQUAL_IS; - strcpy(b + 4, cfg.termspeed); - n = 4 + strlen(cfg.termspeed); + strcpy((char *)(b + 4), telnet->cfg.termspeed); + n = 4 + strlen(telnet->cfg.termspeed); b[n] = IAC; b[n + 1] = SE; - telnet->bufsize = sk_write(telnet->s, b, n + 2); + telnet->bufsize = sk_write(telnet->s, (char *)b, n + 2); logevent(telnet->frontend, "server:\tSB TSPEED SEND"); - logbuf = dupprintf("client:\tSB TSPEED IS %s", cfg.termspeed); + logbuf = dupprintf("client:\tSB TSPEED IS %s", telnet->cfg.termspeed); logevent(telnet->frontend, logbuf); sfree(logbuf); } else @@ -405,14 +434,14 @@ static void process_subneg(Telnet telnet) b[1] = SB; b[2] = TELOPT_TTYPE; b[3] = TELQUAL_IS; - for (n = 0; cfg.termtype[n]; n++) - b[n + 4] = (cfg.termtype[n] >= 'a' - && cfg.termtype[n] <= - 'z' ? cfg.termtype[n] + 'A' - - 'a' : cfg.termtype[n]); + for (n = 0; telnet->cfg.termtype[n]; n++) + b[n + 4] = (telnet->cfg.termtype[n] >= 'a' + && telnet->cfg.termtype[n] <= + 'z' ? telnet->cfg.termtype[n] + 'A' - + 'a' : telnet->cfg.termtype[n]); b[n + 4] = IAC; b[n + 5] = SE; - telnet->bufsize = sk_write(telnet->s, b, n + 6); + telnet->bufsize = sk_write(telnet->s, (char *)b, n + 6); b[n + 4] = 0; logevent(telnet->frontend, "server:\tSB TTYPE SEND"); logbuf = dupprintf("client:\tSB TTYPE IS %s", b + 4); @@ -432,7 +461,7 @@ static void process_subneg(Telnet telnet) logevent(telnet->frontend, logbuf); sfree(logbuf); if (telnet->sb_opt == TELOPT_OLD_ENVIRON) { - if (cfg.rfc_environ) { + if (telnet->cfg.rfc_environ) { value = RFC_VALUE; var = RFC_VAR; } else { @@ -465,7 +494,7 @@ static void process_subneg(Telnet telnet) b[2] = telnet->sb_opt; b[3] = TELQUAL_IS; n = 4; - e = cfg.environmt; + e = telnet->cfg.environmt; while (*e) { b[n++] = var; while (*e && *e != '\t') @@ -477,22 +506,27 @@ static void process_subneg(Telnet telnet) b[n++] = *e++; e++; } - if (*cfg.username) { + if (*telnet->cfg.username) { b[n++] = var; b[n++] = 'U'; b[n++] = 'S'; b[n++] = 'E'; b[n++] = 'R'; b[n++] = value; - e = cfg.username; + e = telnet->cfg.username; while (*e) b[n++] = *e++; } b[n++] = IAC; b[n++] = SE; - telnet->bufsize = sk_write(telnet->s, b, n); - logbuf = dupprintf("client:\tSB %s IS %s", telopt(telnet->sb_opt), - n == 6 ? "" : ""); + telnet->bufsize = sk_write(telnet->s, (char *)b, n); + logbuf = dupprintf("client:\tSB %s IS %s%s%s%s", + telopt(telnet->sb_opt), + *telnet->cfg.username ? "USER=" : "", + telnet->cfg.username, + *telnet->cfg.username ? " " : "", + n == 6 ? "" : + (*telnet->cfg.environmt ? "" : "")); logevent(telnet->frontend, logbuf); sfree(logbuf); } @@ -584,18 +618,11 @@ static void do_telnet_read(Telnet telnet, char *buf, int len) else { subneg_addchar: if (telnet->sb_len >= telnet->sb_size) { - char *newbuf; telnet->sb_size += SB_DELTA; - newbuf = (telnet->sb_buf ? - srealloc(telnet->sb_buf, telnet->sb_size) : - smalloc(telnet->sb_size)); - if (newbuf) - telnet->sb_buf = newbuf; - else - telnet->sb_size -= SB_DELTA; + telnet->sb_buf = sresize(telnet->sb_buf, telnet->sb_size, + unsigned char); } - if (telnet->sb_len < telnet->sb_size) - telnet->sb_buf[telnet->sb_len++] = c; + telnet->sb_buf[telnet->sb_len++] = c; telnet->state = SUBNEGOT; /* in case we came here by goto */ } break; @@ -611,7 +638,7 @@ static void do_telnet_read(Telnet telnet, char *buf, int len) } } -static int telnet_closing(Plug plug, char *error_msg, int error_code, +static int telnet_closing(Plug plug, const char *error_msg, int error_code, int calling_back) { Telnet telnet = (Telnet) plug; @@ -619,11 +646,12 @@ static int telnet_closing(Plug plug, char *error_msg, int error_code, if (telnet->s) { sk_close(telnet->s); telnet->s = NULL; + notify_remote_exit(telnet->frontend); } if (error_msg) { /* A socket error has occurred. */ logevent(telnet->frontend, error_msg); - connection_fatal("%s", error_msg); + connection_fatal(telnet->frontend, "%s", error_msg); } /* Otherwise, the remote side closed the connection normally. */ return 0; } @@ -651,8 +679,10 @@ static void telnet_sent(Plug plug, int bufsize) * Also places the canonical host name into `realhost'. It must be * freed by the caller. */ -static char *telnet_init(void *frontend_handle, void **backend_handle, - char *host, int port, char **realhost, int nodelay) +static const char *telnet_init(void *frontend_handle, void **backend_handle, + Config *cfg, + char *host, int port, char **realhost, + int nodelay, int keepalive) { static const struct plug_function_table fn_table = { telnet_closing, @@ -660,11 +690,12 @@ static char *telnet_init(void *frontend_handle, void **backend_handle, telnet_sent }; SockAddr addr; - char *err; + const char *err; Telnet telnet; - telnet = smalloc(sizeof(*telnet)); + telnet = snew(struct telnet_tag); telnet->fn = &fn_table; + telnet->cfg = *cfg; /* STRUCTURE COPY */ telnet->s = NULL; telnet->echoing = TRUE; telnet->editing = TRUE; @@ -672,9 +703,11 @@ static char *telnet_init(void *frontend_handle, void **backend_handle, telnet->sb_buf = NULL; telnet->sb_size = 0; telnet->frontend = frontend_handle; - telnet->term_width = cfg.width; - telnet->term_height = cfg.height; + telnet->term_width = telnet->cfg.width; + telnet->term_height = telnet->cfg.height; telnet->state = TOP_LEVEL; + telnet->ldisc = NULL; + telnet->pinger = NULL; *backend_handle = telnet; /* @@ -682,13 +715,18 @@ static char *telnet_init(void *frontend_handle, void **backend_handle, */ { char *buf; - buf = dupprintf("Looking up host \"%s\"", host); + buf = dupprintf("Looking up host \"%s\"%s", host, + (cfg->addressfamily == ADDRTYPE_IPV4 ? " (IPv4)" : + (cfg->addressfamily == ADDRTYPE_IPV6 ? " (IPv6)" : + ""))); logevent(telnet->frontend, buf); sfree(buf); } - addr = name_lookup(host, port, realhost); - if ((err = sk_addr_error(addr))) + addr = name_lookup(host, port, realhost, &telnet->cfg, cfg->addressfamily); + if ((err = sk_addr_error(addr)) != NULL) { + sk_addr_free(addr); return err; + } if (port < 0) port = 23; /* default telnet port */ @@ -704,16 +742,16 @@ static char *telnet_init(void *frontend_handle, void **backend_handle, sfree(buf); } telnet->s = new_connection(addr, *realhost, port, 0, 1, - nodelay, (Plug) telnet); - if ((err = sk_socket_error(telnet->s))) + nodelay, keepalive, (Plug) telnet, &telnet->cfg); + if ((err = sk_socket_error(telnet->s)) != NULL) return err; - sk_addr_free(addr); + telnet->pinger = pinger_new(&telnet->cfg, &telnet_backend, telnet); /* * Initialise option states. */ - if (cfg.passive_telnet) { + if (telnet->cfg.passive_telnet) { const struct Opt *const *o; for (o = opts; *o; o++) @@ -734,36 +772,65 @@ static char *telnet_init(void *frontend_handle, void **backend_handle, */ telnet->in_synch = FALSE; + /* + * We can send special commands from the start. + */ + update_specials_menu(telnet->frontend); + return NULL; } +static void telnet_free(void *handle) +{ + Telnet telnet = (Telnet) handle; + + sfree(telnet->sb_buf); + if (telnet->s) + sk_close(telnet->s); + if (telnet->pinger) + pinger_free(telnet->pinger); + sfree(telnet); +} +/* + * Reconfigure the Telnet backend. There's no immediate action + * necessary, in this backend: we just save the fresh config for + * any subsequent negotiations. + */ +static void telnet_reconfig(void *handle, Config *cfg) +{ + Telnet telnet = (Telnet) handle; + pinger_reconfig(telnet->pinger, &telnet->cfg, cfg); + telnet->cfg = *cfg; /* STRUCTURE COPY */ +} + /* * Called to send data down the Telnet connection. */ static int telnet_send(void *handle, char *buf, int len) { Telnet telnet = (Telnet) handle; - char *p; - static unsigned char iac[2] = { IAC, IAC }; - static unsigned char cr[2] = { CR, NUL }; + unsigned char *p, *end; + static const unsigned char iac[2] = { IAC, IAC }; + static const unsigned char cr[2] = { CR, NUL }; #if 0 - static unsigned char nl[2] = { CR, LF }; + static const unsigned char nl[2] = { CR, LF }; #endif if (telnet->s == NULL) return 0; - p = buf; - while (p < buf + len) { - char *q = p; + p = (unsigned char *)buf; + end = (unsigned char *)(buf + len); + while (p < end) { + unsigned char *q = p; - while (p < buf + len && iswritable((unsigned char) *p)) + while (p < end && iswritable(*p)) p++; - telnet->bufsize = sk_write(telnet->s, q, p - q); + telnet->bufsize = sk_write(telnet->s, (char *)q, p - q); - while (p < buf + len && !iswritable((unsigned char) *p)) { + while (p < end && !iswritable(*p)) { telnet->bufsize = - sk_write(telnet->s, (unsigned char) *p == IAC ? iac : cr, 2); + sk_write(telnet->s, (char *)(*p == IAC ? iac : cr), 2); p++; } } @@ -809,7 +876,7 @@ static void telnet_size(void *handle, int width, int height) if (b[n-1] == IAC) b[n++] = IAC; /* duplicate any IAC byte occurs */ b[n++] = IAC; b[n++] = SE; - telnet->bufsize = sk_write(telnet->s, b, n); + telnet->bufsize = sk_write(telnet->s, (char *)b, n); logbuf = dupprintf("client:\tSB NAWS %d,%d", telnet->term_width, telnet->term_height); logevent(telnet->frontend, logbuf); @@ -831,63 +898,64 @@ static void telnet_special(void *handle, Telnet_Special code) switch (code) { case TS_AYT: b[1] = AYT; - telnet->bufsize = sk_write(telnet->s, b, 2); + telnet->bufsize = sk_write(telnet->s, (char *)b, 2); break; case TS_BRK: b[1] = BREAK; - telnet->bufsize = sk_write(telnet->s, b, 2); + telnet->bufsize = sk_write(telnet->s, (char *)b, 2); break; case TS_EC: b[1] = EC; - telnet->bufsize = sk_write(telnet->s, b, 2); + telnet->bufsize = sk_write(telnet->s, (char *)b, 2); break; case TS_EL: b[1] = EL; - telnet->bufsize = sk_write(telnet->s, b, 2); + telnet->bufsize = sk_write(telnet->s, (char *)b, 2); break; case TS_GA: b[1] = GA; - telnet->bufsize = sk_write(telnet->s, b, 2); + telnet->bufsize = sk_write(telnet->s, (char *)b, 2); break; case TS_NOP: b[1] = NOP; - telnet->bufsize = sk_write(telnet->s, b, 2); + telnet->bufsize = sk_write(telnet->s, (char *)b, 2); break; case TS_ABORT: b[1] = ABORT; - telnet->bufsize = sk_write(telnet->s, b, 2); + telnet->bufsize = sk_write(telnet->s, (char *)b, 2); break; case TS_AO: b[1] = AO; - telnet->bufsize = sk_write(telnet->s, b, 2); + telnet->bufsize = sk_write(telnet->s, (char *)b, 2); break; case TS_IP: b[1] = IP; - telnet->bufsize = sk_write(telnet->s, b, 2); + telnet->bufsize = sk_write(telnet->s, (char *)b, 2); break; case TS_SUSP: b[1] = SUSP; - telnet->bufsize = sk_write(telnet->s, b, 2); + telnet->bufsize = sk_write(telnet->s, (char *)b, 2); break; case TS_EOR: b[1] = EOR; - telnet->bufsize = sk_write(telnet->s, b, 2); + telnet->bufsize = sk_write(telnet->s, (char *)b, 2); break; case TS_EOF: b[1] = xEOF; - telnet->bufsize = sk_write(telnet->s, b, 2); + telnet->bufsize = sk_write(telnet->s, (char *)b, 2); break; case TS_EOL: - /* In BINARY mode, CR-LF becomes just CR. */ + /* In BINARY mode, CR-LF becomes just CR - + * and without the NUL suffix too. */ if (telnet->opt_states[o_we_bin.index] == ACTIVE) - telnet->bufsize = sk_write(telnet->s, "\r", 2); + telnet->bufsize = sk_write(telnet->s, "\r", 1); else telnet->bufsize = sk_write(telnet->s, "\r\n", 2); break; case TS_SYNCH: b[1] = DM; - telnet->bufsize = sk_write(telnet->s, b, 1); - telnet->bufsize = sk_write_oob(telnet->s, b + 1, 1); + telnet->bufsize = sk_write(telnet->s, (char *)b, 1); + telnet->bufsize = sk_write_oob(telnet->s, (char *)(b + 1), 1); break; case TS_RECHO: if (telnet->opt_states[o_echo.index] == INACTIVE || @@ -905,12 +973,37 @@ static void telnet_special(void *handle, Telnet_Special code) case TS_PING: if (telnet->opt_states[o_they_sga.index] == ACTIVE) { b[1] = NOP; - telnet->bufsize = sk_write(telnet->s, b, 2); + telnet->bufsize = sk_write(telnet->s, (char *)b, 2); } break; + default: + break; /* never heard of it */ } } +static const struct telnet_special *telnet_get_specials(void *handle) +{ + static const struct telnet_special specials[] = { + {"Are You There", TS_AYT}, + {"Break", TS_BRK}, + {"Synch", TS_SYNCH}, + {"Erase Character", TS_EC}, + {"Erase Line", TS_EL}, + {"Go Ahead", TS_GA}, + {"No Operation", TS_NOP}, + {NULL, TS_SEP}, + {"Abort Process", TS_ABORT}, + {"Abort Output", TS_AO}, + {"Interrupt Process", TS_IP}, + {"Suspend Process", TS_SUSP}, + {NULL, TS_SEP}, + {"End Of Record", TS_EOR}, + {"End Of File", TS_EOF}, + {NULL, TS_EXITMENU} + }; + return specials; +} + static Socket telnet_socket(void *handle) { Telnet telnet = (Telnet) handle; @@ -952,17 +1045,31 @@ static void telnet_provide_logctx(void *handle, void *logctx) static int telnet_exitcode(void *handle) { - /* Telnet telnet = (Telnet) handle; */ - /* Telnet doesn't transmit exit codes back to the client */ + Telnet telnet = (Telnet) handle; + if (telnet->s != NULL) + return -1; /* still connected */ + else + /* Telnet doesn't transmit exit codes back to the client */ + return 0; +} + +/* + * cfg_info for Telnet does nothing at all. + */ +static int telnet_cfg_info(void *handle) +{ return 0; } Backend telnet_backend = { telnet_init, + telnet_free, + telnet_reconfig, telnet_send, telnet_sendbuffer, telnet_size, telnet_special, + telnet_get_specials, telnet_socket, telnet_exitcode, telnet_sendok, @@ -970,5 +1077,6 @@ Backend telnet_backend = { telnet_provide_ldisc, telnet_provide_logctx, telnet_unthrottle, + telnet_cfg_info, 23 };