X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=rlogin.c;h=97699aea6260b8c2e325efc0837d18c8ba0d5b16;hb=88a3baa06541fc6563f5f94bac4758141eada690;hp=a2199cf5191ac3ea5ac07b0e7d78df7d3e406208;hpb=ac97a0cb1d7f37181f7cf3997b67cf4af5b76ca8;p=PuTTY.git

diff --git a/rlogin.c b/rlogin.c
index a2199cf5..97699aea 100644
--- a/rlogin.c
+++ b/rlogin.c
@@ -73,6 +73,11 @@ static int rlogin_receive(Plug plug, int urgent, char *data, int len)
     return 1;
 }
 
+static void rlogin_sent(Plug plug, int bufsize)
+{
+    rlogin_bufsize = bufsize;
+}
+
 /*
  * Called to set up the rlogin connection.
  * 
@@ -81,11 +86,12 @@ static int rlogin_receive(Plug plug, int urgent, char *data, int len)
  * 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)
+static char *rlogin_init(char *host, int port, char **realhost, int nodelay)
 {
     static struct plug_function_table fn_table = {
 	rlogin_closing,
-	rlogin_receive
+	rlogin_receive,
+	rlogin_sent
     }, *fn_table_ptr = &fn_table;
 
     SockAddr addr;
@@ -94,6 +100,11 @@ static char *rlogin_init(char *host, int port, char **realhost)
     /*
      * Try to find host.
      */
+    {
+	char buf[200];
+	sprintf(buf, "Looking up host \"%.170s\"", host);
+	logevent(buf);
+    }
     addr = sk_namelookup(host, realhost);
     if ((err = sk_addr_error(addr)))
 	return err;
@@ -104,7 +115,13 @@ static char *rlogin_init(char *host, int port, char **realhost)
     /*
      * Open socket.
      */
-    s = sk_new(addr, port, 1, 0, &fn_table_ptr);
+    {
+	char buf[200], addrbuf[100];
+	sk_getaddr(addr, addrbuf, 100);
+	sprintf(buf, "Connecting to %.100s port %d", addrbuf, port);
+	logevent(buf);
+    }
+    s = sk_new(addr, port, 1, 0, nodelay, &fn_table_ptr);
     if ((err = sk_socket_error(s)))
 	return err;
 
@@ -160,6 +177,9 @@ static void rlogin_size(void)
 {
     char b[12] = { '\xFF', '\xFF', 0x73, 0x73, 0, 0, 0, 0, 0, 0, 0, 0 };
 
+    if (s == NULL)
+	return;
+    
     b[6] = cols >> 8;
     b[7] = cols & 0xFF;
     b[4] = rows >> 8;