Loose end from r5031: the Kex panel should only be displayed in

[u/mdw/putty] / raw.c

diff --git a/raw.c b/raw.c
index 9eb2286..631320c 100644 (file)
--- a/raw.c
+++ b/raw.c
@@ -29,7 +29,7 @@ static void c_write(Raw raw, char *buf, int len)
     sk_set_frozen(raw->s, backlog > RAW_MAX_BACKLOG);
 }
 
-static int raw_closing(Plug plug, char *error_msg, int error_code,
+static int raw_closing(Plug plug, const char *error_msg, int error_code,
                       int calling_back)
 {
     Raw raw = (Raw) plug;
@@ -37,11 +37,12 @@ static int raw_closing(Plug plug, char *error_msg, int error_code,
     if (raw->s) {
         sk_close(raw->s);
         raw->s = NULL;
+       notify_remote_exit(raw->frontend);
     }
     if (error_msg) {
        /* A socket error has occurred. */
        logevent(raw->frontend, error_msg);
-       connection_fatal("%s", error_msg);
+       connection_fatal(raw->frontend, "%s", error_msg);
     }                                 /* Otherwise, the remote side closed the connection normally. */
     return 0;
 }
@@ -67,9 +68,10 @@ static void raw_sent(Plug plug, int bufsize)
  * Also places the canonical host name into `realhost'. It must be
  * freed by the caller.
  */
-static char *raw_init(void *frontend_handle, void **backend_handle,
-                     Config *cfg,
-                     char *host, int port, char **realhost, int nodelay)
+static const char *raw_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 = {
        raw_closing,
@@ -77,7 +79,7 @@ static char *raw_init(void *frontend_handle, void **backend_handle,
        raw_sent
     };
     SockAddr addr;
-    char *err;
+    const char *err;
     Raw raw;
 
     raw = snew(struct raw_backend_data);
@@ -97,8 +99,10 @@ static char *raw_init(void *frontend_handle, void **backend_handle,
        sfree(buf);
     }
     addr = name_lookup(host, port, realhost, cfg);
-    if ((err = sk_addr_error(addr)) != NULL)
+    if ((err = sk_addr_error(addr)) != NULL) {
+       sk_addr_free(addr);
        return err;
+    }
 
     if (port < 0)
        port = 23;                     /* default telnet port */
@@ -113,13 +117,11 @@ static char *raw_init(void *frontend_handle, void **backend_handle,
        logevent(raw->frontend, buf);
        sfree(buf);
     }
-    raw->s = new_connection(addr, *realhost, port, 0, 1, nodelay,
+    raw->s = new_connection(addr, *realhost, port, 0, 1, nodelay, keepalive,
                            (Plug) raw, cfg);
     if ((err = sk_socket_error(raw->s)) != NULL)
        return err;
 
-    sk_addr_free(addr);
-
     return NULL;
 }
 
@@ -181,6 +183,15 @@ static void raw_special(void *handle, Telnet_Special code)
     return;
 }
 
+/*
+ * Return a list of the special codes that make sense in this
+ * protocol.
+ */
+static const struct telnet_special *raw_get_specials(void *handle)
+{
+    return NULL;
+}
+
 static Socket raw_socket(void *handle)
 {
     Raw raw = (Raw) handle;
@@ -225,6 +236,14 @@ static int raw_exitcode(void *handle)
         return 0;
 }
 
+/*
+ * cfg_info for Raw does nothing at all.
+ */
+static int raw_cfg_info(void *handle)
+{
+    return 0;
+}
+
 Backend raw_backend = {
     raw_init,
     raw_free,
@@ -233,6 +252,7 @@ Backend raw_backend = {
     raw_sendbuffer,
     raw_size,
     raw_special,
+    raw_get_specials,
     raw_socket,
     raw_exitcode,
     raw_sendok,
@@ -240,5 +260,6 @@ Backend raw_backend = {
     raw_provide_ldisc,
     raw_provide_logctx,
     raw_unthrottle,
+    raw_cfg_info,
     1
 };