Integrate unfix.org's IPv6 patches up to level 10, with rather a lot

[u/mdw/putty] / telnet.c

diff --git a/telnet.c b/telnet.c
index 6f4f54c..6789e5d 100644 (file)
--- 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);
        }
@@ -639,6 +646,7 @@ 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. */
@@ -698,6 +706,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 +715,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;
@@ -733,6 +746,8 @@ static const char *telnet_init(void *frontend_handle, void **backend_handle,
     if ((err = sk_socket_error(telnet->s)) != NULL)
        return err;
 
+    telnet->pinger = pinger_new(&telnet->cfg, &telnet_backend, telnet);
+
     /*
      * Initialise option states.
      */
@@ -757,6 +772,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 +787,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 +799,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 +976,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 +991,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 +1053,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 +1077,6 @@ Backend telnet_backend = {
     telnet_provide_ldisc,
     telnet_provide_logctx,
     telnet_unthrottle,
+    telnet_cfg_info,
     23
 };