Major destabilisation, phase 1. In this phase I've moved (I think)

[u/mdw/putty] / rlogin.c

diff --git a/rlogin.c b/rlogin.c
index a80d12e..4baada7 100644 (file)
--- a/rlogin.c
+++ b/rlogin.c
@@ -4,6 +4,7 @@
 #include <ctype.h>
 
 #include "putty.h"
+#include "terminal.h"
 
 #ifndef FALSE
 #define FALSE 0
@@ -16,12 +17,13 @@
 
 static Socket s = NULL;
 static int rlogin_bufsize;
+static void *frontend;
 
 static void rlogin_size(void);
 
 static void c_write(char *buf, int len)
 {
-    int backlog = from_backend(0, buf, len);
+    int backlog = from_backend(frontend, 0, buf, len);
     sk_set_frozen(s, backlog > RLOGIN_MAX_BACKLOG);
 }
 
@@ -34,7 +36,8 @@ static int rlogin_closing(Plug plug, char *error_msg, int error_code,
     }
     if (error_msg) {
        /* A socket error has occurred. */
-       connection_fatal(error_msg);
+       logevent(error_msg);
+       connection_fatal("%s", error_msg);
     }                                 /* Otherwise, the remote side closed the connection normally. */
     return 0;
 }
@@ -87,7 +90,8 @@ 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(char *host, int port, char **realhost, int nodelay)
+static char *rlogin_init(void *frontend_handle,
+                        char *host, int port, char **realhost, int nodelay)
 {
     static struct plug_function_table fn_table = {
        rlogin_closing,
@@ -98,6 +102,8 @@ static char *rlogin_init(char *host, int port, char **realhost, int nodelay)
     SockAddr addr;
     char *err;
 
+    frontend = frontend_handle;
+
     /*
      * Try to find host.
      */
@@ -122,7 +128,7 @@ static char *rlogin_init(char *host, int port, char **realhost, int nodelay)
        sprintf(buf, "Connecting to %.100s port %d", addrbuf, port);
        logevent(buf);
     }
-    s = sk_new(addr, port, 1, 0, nodelay, &fn_table_ptr);
+    s = new_connection(addr, *realhost, port, 1, 0, nodelay, &fn_table_ptr);
     if ((err = sk_socket_error(s)))
        return err;
 
@@ -178,13 +184,13 @@ static void rlogin_size(void)
 {
     char b[12] = { '\xFF', '\xFF', 0x73, 0x73, 0, 0, 0, 0, 0, 0, 0, 0 };
 
-    if (s == NULL)
+    if (s == NULL || term == NULL)
        return;
     
-    b[6] = cols >> 8;
-    b[7] = cols & 0xFF;
-    b[4] = rows >> 8;
-    b[5] = rows & 0xFF;
+    b[6] = term->cols >> 8;
+    b[7] = term->cols & 0xFF;
+    b[4] = term->rows >> 8;
+    b[5] = term->rows & 0xFF;
     rlogin_bufsize = sk_write(s, b, 12);
     return;
 }