X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/32874aeac8dacbca26663777b39a79efc5d8dc4b..d8d6c7e50e1fcf5171ec15f8a3e9bdcd141f0b64:/rlogin.c

diff --git a/rlogin.c b/rlogin.c
index 688c1594..ba7dd37b 100644
--- a/rlogin.c
+++ b/rlogin.c
@@ -12,25 +12,26 @@
 #define TRUE 1
 #endif
 
+#define RLOGIN_MAX_BACKLOG 4096
+
 static Socket s = NULL;
+static int rlogin_bufsize;
 
 static void rlogin_size(void);
 
-static int sb_opt, sb_len;
-static char *sb_buf = NULL;
-static int sb_size = 0;
-#define SB_DELTA 1024
-
 static void c_write(char *buf, int len)
 {
-    from_backend(0, buf, len);
+    int backlog = from_backend(0, buf, len);
+    sk_set_frozen(s, backlog > RLOGIN_MAX_BACKLOG);
 }
 
 static int rlogin_closing(Plug plug, char *error_msg, int error_code,
 			  int calling_back)
 {
-    sk_close(s);
-    s = NULL;
+    if (s) {
+        sk_close(s);
+        s = NULL;
+    }
     if (error_msg) {
 	/* A socket error has occurred. */
 	connection_fatal(error_msg);
@@ -72,18 +73,25 @@ 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.
  * 
  * Returns an error message, or NULL on success.
  *
- * Also places the canonical host name into `realhost'.
+ * 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;
@@ -92,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;
@@ -102,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;
 
@@ -124,7 +143,7 @@ static char *rlogin_init(char *host, int port, char **realhost)
 	sk_write(s, "/", 1);
 	for (p = cfg.termspeed; isdigit(*p); p++);
 	sk_write(s, cfg.termspeed, p - cfg.termspeed);
-	sk_write(s, &z, 1);
+	rlogin_bufsize = sk_write(s, &z, 1);
     }
 
     return NULL;
@@ -133,13 +152,22 @@ static char *rlogin_init(char *host, int port, char **realhost)
 /*
  * Called to send data down the rlogin connection.
  */
-static void rlogin_send(char *buf, int len)
+static int rlogin_send(char *buf, int len)
 {
-
     if (s == NULL)
-	return;
+	return 0;
+
+    rlogin_bufsize = sk_write(s, buf, len);
 
-    sk_write(s, buf, len);
+    return rlogin_bufsize;
+}
+
+/*
+ * Called to query the current socket sendability status.
+ */
+static int rlogin_sendbuffer(void)
+{
+    return rlogin_bufsize;
 }
 
 /*
@@ -149,11 +177,14 @@ 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;
     b[5] = rows & 0xFF;
-    sk_write(s, b, 12);
+    rlogin_bufsize = sk_write(s, b, 12);
     return;
 }
 
@@ -176,18 +207,32 @@ static int rlogin_sendok(void)
     return 1;
 }
 
+static void rlogin_unthrottle(int backlog)
+{
+    sk_set_frozen(s, backlog > RLOGIN_MAX_BACKLOG);
+}
+
 static int rlogin_ldisc(int option)
 {
     return 0;
 }
 
+static int rlogin_exitcode(void)
+{
+    /* If we ever implement RSH, we'll probably need to do this properly */
+    return 0;
+}
+
 Backend rlogin_backend = {
     rlogin_init,
     rlogin_send,
+    rlogin_sendbuffer,
     rlogin_size,
     rlogin_special,
     rlogin_socket,
+    rlogin_exitcode,
     rlogin_sendok,
     rlogin_ldisc,
+    rlogin_unthrottle,
     1
 };