X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/125105d16c788398562ac03e91ce7a0dc0292492..055817455466c8eb60392f30bb7c689763962e17:/rlogin.c

diff --git a/rlogin.c b/rlogin.c
index c12a0802..29d7be56 100644
--- a/rlogin.c
+++ b/rlogin.c
@@ -32,18 +32,19 @@ static void c_write(Rlogin rlogin, char *buf, int len)
     sk_set_frozen(rlogin->s, backlog > RLOGIN_MAX_BACKLOG);
 }
 
-static int rlogin_closing(Plug plug, char *error_msg, int error_code,
+static int rlogin_closing(Plug plug, const char *error_msg, int error_code,
 			  int calling_back)
 {
     Rlogin rlogin = (Rlogin) plug;
     if (rlogin->s) {
         sk_close(rlogin->s);
         rlogin->s = NULL;
+	notify_remote_exit(rlogin->frontend);
     }
     if (error_msg) {
 	/* A socket error has occurred. */
 	logevent(rlogin->frontend, error_msg);
-	connection_fatal("%s", error_msg);
+	connection_fatal(rlogin->frontend, "%s", error_msg);
     }				       /* Otherwise, the remote side closed the connection normally. */
     return 0;
 }
@@ -97,9 +98,10 @@ static void rlogin_sent(Plug plug, int bufsize)
  * Also places the canonical host name into `realhost'. It must be
  * 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 char *rlogin_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 = {
 	rlogin_closing,
@@ -107,7 +109,7 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
 	rlogin_sent
     };
     SockAddr addr;
-    char *err;
+    const char *err;
     Rlogin rlogin;
 
     rlogin = snew(struct rlogin_tag);
@@ -124,13 +126,18 @@ static char *rlogin_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(rlogin->frontend, buf);
 	sfree(buf);
     }
-    addr = name_lookup(host, port, realhost, cfg);
-    if ((err = sk_addr_error(addr)) != NULL)
+    addr = name_lookup(host, port, realhost, cfg, cfg->addressfamily);
+    if ((err = sk_addr_error(addr)) != NULL) {
+	sk_addr_free(addr);
 	return err;
+    }
 
     if (port < 0)
 	port = 513;		       /* default rlogin port */
@@ -146,12 +153,10 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
 	sfree(buf);
     }
     rlogin->s = new_connection(addr, *realhost, port, 1, 0,
-			       nodelay, (Plug) rlogin, cfg);
+			       nodelay, keepalive, (Plug) rlogin, cfg);
     if ((err = sk_socket_error(rlogin->s)) != NULL)
 	return err;
 
-    sk_addr_free(addr);
-
     /*
      * Send local username, remote username, terminal/speed
      */
@@ -301,6 +306,14 @@ static int rlogin_exitcode(void *handle)
         return 0;
 }
 
+/*
+ * cfg_info for rlogin does nothing at all.
+ */
+static int rlogin_cfg_info(void *handle)
+{
+    return 0;
+}
+
 Backend rlogin_backend = {
     rlogin_init,
     rlogin_free,
@@ -317,5 +330,6 @@ Backend rlogin_backend = {
     rlogin_provide_ldisc,
     rlogin_provide_logctx,
     rlogin_unthrottle,
+    rlogin_cfg_info,
     1
 };