X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/b47b21989c2dd9c7ce0e973b3730965f9d99b990..01c034ad857128c51482a563befb374e38ebe668:/rlogin.c

diff --git a/rlogin.c b/rlogin.c
index 850d906d..acb27c8d 100644
--- a/rlogin.c
+++ b/rlogin.c
@@ -1,6 +1,7 @@
 #include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <ctype.h>
 
 #include "putty.h"
 
@@ -24,24 +25,22 @@ static void c_write (char *buf, int len) {
     from_backend(0, buf, len);
 }
 
-static int rlogin_receive (Socket skt, int urgent, char *data, int len) {
-    if (urgent==3) {
+static int rlogin_closing (Plug plug, char *error_msg, int error_code, int calling_back) {
+    sk_close(s);
+    s = NULL;
+    if (error_msg) {
         /* A socket error has occurred. */
-        sk_close(s);
-        s = NULL;
-        connection_fatal(data);
-        return 0;
-    } else if (!len) {
-	/* Connection has closed. */
-	sk_close(s);
-	s = NULL;
-	return 0;
-    }
+        connection_fatal (error_msg);
+    } /* Otherwise, the remote side closed the connection normally. */
+    return 0;
+}
+
+static int rlogin_receive (Plug plug, int urgent, char *data, int len) {
     if (urgent == 2) {
         char c;
         
         c = *data++; len--;
-        if (c == 0x80)
+        if (c == '\x80')
             rlogin_size();
         /*
          * We should flush everything (aka Telnet SYNCH) if we see
@@ -49,8 +48,22 @@ static int rlogin_receive (Socket skt, int urgent, char *data, int len) {
          * on 0x10 and 0x20 respectively. I'm not convinced it's
          * worth it...
          */
+    } else {
+        /*
+         * Main rlogin protocol. This is really simple: the first
+         * byte is expected to be NULL and is ignored, and the rest
+         * is printed.
+         */
+        static int firstbyte = 1;
+        if (firstbyte) {
+            if (data[0] == '\0') {
+                data++;
+                len--;
+            }
+            firstbyte = 0;
+        }
+        c_write(data, len);
     }
-    c_write(data, len);
     return 1;
 }
 
@@ -62,6 +75,11 @@ static int rlogin_receive (Socket skt, int urgent, char *data, int len) {
  * Also places the canonical host name into `realhost'.
  */
 static char *rlogin_init (char *host, int port, char **realhost) {
+    static struct plug_function_table fn_table = {
+	rlogin_closing,
+	rlogin_receive
+    }, *fn_table_ptr = &fn_table;
+
     SockAddr addr;
     char *err;
 
@@ -78,7 +96,7 @@ static char *rlogin_init (char *host, int port, char **realhost) {
     /*
      * Open socket.
      */
-    s = sk_new(addr, port, 1, rlogin_receive);
+    s = sk_new(addr, port, 1, 0, &fn_table_ptr);
     if ( (err = sk_socket_error(s)) )
 	return err;