X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/f85e6f6edb2c9415bc10bd2015479d72ea8c5ae2..7555d6a50b05d96de39b5e95cf11a8f05f0c4fd9:/telnet.c

diff --git a/telnet.c b/telnet.c
index 2edae219..36c0f723 100644
--- a/telnet.c
+++ b/telnet.c
@@ -244,6 +244,8 @@ typedef struct telnet_tag {
     } state;
 
     Config cfg;
+
+    Pinger pinger;
 } *Telnet;
 
 #define TELNET_MAX_BACKLOG 4096
@@ -518,8 +520,13 @@ static void process_subneg(Telnet telnet)
 	    b[n++] = IAC;
 	    b[n++] = SE;
 	    telnet->bufsize = sk_write(telnet->s, (char *)b, n);
-	    logbuf = dupprintf("client:\tSB %s IS %s", telopt(telnet->sb_opt),
-			       n == 6 ? "<nothing>" : "<stuff>");
+	    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 ? "<nothing>" :
+			       (*telnet->cfg.environmt ? "<stuff>" : ""));
 	    logevent(telnet->frontend, logbuf);
 	    sfree(logbuf);
 	}
@@ -631,6 +638,22 @@ static void do_telnet_read(Telnet telnet, char *buf, int len)
     }
 }
 
+static void telnet_log(Plug plug, int type, SockAddr addr, int port,
+		       const char *error_msg, int error_code)
+{
+    Telnet telnet = (Telnet) 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(telnet->frontend, msg);
+}
+
 static int telnet_closing(Plug plug, const char *error_msg, int error_code,
 			  int calling_back)
 {
@@ -639,12 +662,13 @@ static int telnet_closing(Plug plug, const 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(telnet->frontend, "%s", error_msg);
-    }				       /* Otherwise, the remote side closed the connection normally. */
+    }
+    /* Otherwise, the remote side closed the connection normally. */
     return 0;
 }
 
@@ -674,9 +698,10 @@ static void telnet_sent(Plug plug, int bufsize)
 static const char *telnet_init(void *frontend_handle, void **backend_handle,
 			       Config *cfg,
 			       char *host, int port, char **realhost,
-			       int nodelay)
+			       int nodelay, int keepalive)
 {
     static const struct plug_function_table fn_table = {
+	telnet_log,
 	telnet_closing,
 	telnet_receive,
 	telnet_sent
@@ -698,6 +723,8 @@ static const char *telnet_init(void *frontend_handle, void **backend_handle,
     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;
 
     /*
@@ -705,11 +732,14 @@ static const 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, &telnet->cfg);
+    addr = name_lookup(host, port, realhost, &telnet->cfg, cfg->addressfamily);
     if ((err = sk_addr_error(addr)) != NULL) {
 	sk_addr_free(addr);
 	return err;
@@ -721,18 +751,13 @@ static const char *telnet_init(void *frontend_handle, void **backend_handle,
     /*
      * Open socket.
      */
-    {
-	char *buf, addrbuf[100];
-	sk_getaddr(addr, addrbuf, 100);
-	buf = dupprintf("Connecting to %s port %d", addrbuf, port);
-	logevent(telnet->frontend, buf);
-	sfree(buf);
-    }
     telnet->s = new_connection(addr, *realhost, port, 0, 1,
-			       nodelay, (Plug) telnet, &telnet->cfg);
+			       nodelay, keepalive, (Plug) telnet, &telnet->cfg);
     if ((err = sk_socket_error(telnet->s)) != NULL)
 	return err;
 
+    telnet->pinger = pinger_new(&telnet->cfg, &telnet_backend, telnet);
+
     /*
      * Initialise option states.
      */
@@ -757,6 +782,11 @@ static const 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;
 }
 
@@ -767,6 +797,8 @@ static void telnet_free(void *handle)
     sfree(telnet->sb_buf);
     if (telnet->s)
 	sk_close(telnet->s);
+    if (telnet->pinger)
+	pinger_free(telnet->pinger);
     sfree(telnet);
 }
 /*
@@ -777,6 +809,7 @@ static void telnet_free(void *handle)
 static void telnet_reconfig(void *handle, Config *cfg)
 {
     Telnet telnet = (Telnet) handle;
+    pinger_reconfig(telnet->pinger, &telnet->cfg, cfg);
     telnet->cfg = *cfg;		       /* STRUCTURE COPY */
 }
 
@@ -953,6 +986,8 @@ static void telnet_special(void *handle, Telnet_Special code)
 	    telnet->bufsize = sk_write(telnet->s, (char *)b, 2);
 	}
 	break;
+      default:
+	break;	/* never heard of it */
     }
 }
 
@@ -966,15 +1001,15 @@ static const struct telnet_special *telnet_get_specials(void *handle)
 	{"Erase Line", TS_EL},
 	{"Go Ahead", TS_GA},
 	{"No Operation", TS_NOP},
-	{"", 0},
+	{NULL, TS_SEP},
 	{"Abort Process", TS_ABORT},
 	{"Abort Output", TS_AO},
 	{"Interrupt Process", TS_IP},
 	{"Suspend Process", TS_SUSP},
-	{"", 0},
+	{NULL, TS_SEP},
 	{"End Of Record", TS_EOR},
 	{"End Of File", TS_EOF},
-	{NULL, 0}
+	{NULL, TS_EXITMENU}
     };
     return specials;
 }
@@ -1028,6 +1063,14 @@ static int telnet_exitcode(void *handle)
         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,
@@ -1044,5 +1087,6 @@ Backend telnet_backend = {
     telnet_provide_ldisc,
     telnet_provide_logctx,
     telnet_unthrottle,
+    telnet_cfg_info,
     23
 };