X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/6f1e7b78af0f9c4c502609392f62771cf2528d8f..0da1a7905bb03d899c94b3d3d9b25c9e61698390:/rlogin.c

diff --git a/rlogin.c b/rlogin.c
index 9c249f27..8e73ec91 100644
--- a/rlogin.c
+++ b/rlogin.c
@@ -19,6 +19,7 @@ typedef struct rlogin_tag {
 
     Socket s;
     int bufsize;
+    int firstbyte;
     int term_width, term_height;
     void *frontend;
 } *Rlogin;
@@ -69,13 +70,12 @@ static int rlogin_receive(Plug plug, int urgent, char *data, int len)
 	 * byte is expected to be NULL and is ignored, and the rest
 	 * is printed.
 	 */
-	static int firstbyte = 1;
-	if (firstbyte) {
+	if (rlogin->firstbyte) {
 	    if (data[0] == '\0') {
 		data++;
 		len--;
 	    }
-	    firstbyte = 0;
+	    rlogin->firstbyte = 0;
 	}
 	if (len > 0)
             c_write(rlogin, data, len);
@@ -98,6 +98,7 @@ static void rlogin_sent(Plug plug, int bufsize)
  * freed by the caller.
  */
 static char *rlogin_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 = {
@@ -109,12 +110,13 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
     char *err;
     Rlogin rlogin;
 
-    rlogin = smalloc(sizeof(*rlogin));
+    rlogin = snew(struct rlogin_tag);
     rlogin->fn = &fn_table;
     rlogin->s = NULL;
     rlogin->frontend = frontend_handle;
-    rlogin->term_width = cfg.width;
-    rlogin->term_height = cfg.height;
+    rlogin->term_width = cfg->width;
+    rlogin->term_height = cfg->height;
+    rlogin->firstbyte = 1;
     *backend_handle = rlogin;
 
     /*
@@ -126,7 +128,7 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
 	logevent(rlogin->frontend, buf);
 	sfree(buf);
     }
-    addr = name_lookup(host, port, realhost);
+    addr = name_lookup(host, port, realhost, cfg);
     if ((err = sk_addr_error(addr)) != NULL)
 	return err;
 
@@ -144,7 +146,7 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
 	sfree(buf);
     }
     rlogin->s = new_connection(addr, *realhost, port, 1, 0,
-			       nodelay, (Plug) rlogin);
+			       nodelay, (Plug) rlogin, cfg);
     if ((err = sk_socket_error(rlogin->s)) != NULL)
 	return err;
 
@@ -158,20 +160,39 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
 	char z = 0;
 	char *p;
 	sk_write(rlogin->s, &z, 1);
-	sk_write(rlogin->s, cfg.localusername, strlen(cfg.localusername));
+	sk_write(rlogin->s, cfg->localusername,
+		 strlen(cfg->localusername));
 	sk_write(rlogin->s, &z, 1);
-	sk_write(rlogin->s, cfg.username, strlen(cfg.username));
+	sk_write(rlogin->s, cfg->username,
+		 strlen(cfg->username));
 	sk_write(rlogin->s, &z, 1);
-	sk_write(rlogin->s, cfg.termtype, strlen(cfg.termtype));
+	sk_write(rlogin->s, cfg->termtype,
+		 strlen(cfg->termtype));
 	sk_write(rlogin->s, "/", 1);
-	for (p = cfg.termspeed; isdigit(*p); p++) continue;
-	sk_write(rlogin->s, cfg.termspeed, p - cfg.termspeed);
+	for (p = cfg->termspeed; isdigit((unsigned char)*p); p++) continue;
+	sk_write(rlogin->s, cfg->termspeed, p - cfg->termspeed);
 	rlogin->bufsize = sk_write(rlogin->s, &z, 1);
     }
 
     return NULL;
 }
 
+static void rlogin_free(void *handle)
+{
+    Rlogin rlogin = (Rlogin) handle;
+
+    if (rlogin->s)
+	sk_close(rlogin->s);
+    sfree(rlogin);
+}
+
+/*
+ * Stub routine (we don't have any need to reconfigure this backend).
+ */
+static void rlogin_reconfig(void *handle, Config *cfg)
+{
+}
+
 /*
  * Called to send data down the rlogin connection.
  */
@@ -263,13 +284,18 @@ static void rlogin_provide_logctx(void *handle, void *logctx)
 
 static int rlogin_exitcode(void *handle)
 {
-    /* Rlogin rlogin = (Rlogin) handle; */
-    /* If we ever implement RSH, we'll probably need to do this properly */
-    return 0;
+    Rlogin rlogin = (Rlogin) handle;
+    if (rlogin->s != NULL)
+        return -1;                     /* still connected */
+    else
+        /* If we ever implement RSH, we'll probably need to do this properly */
+        return 0;
 }
 
 Backend rlogin_backend = {
     rlogin_init,
+    rlogin_free,
+    rlogin_reconfig,
     rlogin_send,
     rlogin_sendbuffer,
     rlogin_size,