pterm.c now relies on backend `exitcode' functions returning <0 when

[u/mdw/putty] / raw.c

diff --git a/raw.c b/raw.c
index 7aaafb3..9eb2286 100644 (file)
--- a/raw.c
+++ b/raw.c
@@ -68,6 +68,7 @@ static void raw_sent(Plug plug, int bufsize)
  * 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 struct plug_function_table fn_table = {
@@ -79,7 +80,7 @@ static char *raw_init(void *frontend_handle, void **backend_handle,
     char *err;
     Raw raw;
 
-    raw = smalloc(sizeof(*raw));
+    raw = snew(struct raw_backend_data);
     raw->fn = &fn_table;
     raw->s = NULL;
     *backend_handle = raw;
@@ -95,8 +96,8 @@ static char *raw_init(void *frontend_handle, void **backend_handle,
        logevent(raw->frontend, buf);
        sfree(buf);
     }
-    addr = sk_namelookup(host, realhost);
-    if ((err = sk_addr_error(addr)))
+    addr = name_lookup(host, port, realhost, cfg);
+    if ((err = sk_addr_error(addr)) != NULL)
        return err;
 
     if (port < 0)
@@ -112,8 +113,9 @@ 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, (Plug) raw);
-    if ((err = sk_socket_error(raw->s)))
+    raw->s = new_connection(addr, *realhost, port, 0, 1, nodelay,
+                           (Plug) raw, cfg);
+    if ((err = sk_socket_error(raw->s)) != NULL)
        return err;
 
     sk_addr_free(addr);
@@ -121,6 +123,22 @@ static char *raw_init(void *frontend_handle, void **backend_handle,
     return NULL;
 }
 
+static void raw_free(void *handle)
+{
+    Raw raw = (Raw) handle;
+
+    if (raw->s)
+       sk_close(raw->s);
+    sfree(raw);
+}
+
+/*
+ * Stub routine (we don't have any need to reconfigure this backend).
+ */
+static void raw_reconfig(void *handle, Config *cfg)
+{
+}
+
 /*
  * Called to send data down the raw connection.
  */
@@ -199,12 +217,18 @@ static void raw_provide_logctx(void *handle, void *logctx)
 
 static int raw_exitcode(void *handle)
 {
-    /* Exit codes are a meaningless concept in the Raw protocol */
-    return 0;
+    Raw raw = (Raw) handle;
+    if (raw->s != NULL)
+        return -1;                     /* still connected */
+    else
+        /* Exit codes are a meaningless concept in the Raw protocol */
+        return 0;
 }
 
 Backend raw_backend = {
     raw_init,
+    raw_free,
+    raw_reconfig,
     raw_send,
     raw_sendbuffer,
     raw_size,