X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/32874aeac8dacbca26663777b39a79efc5d8dc4b..8eebd22198133e95ce25af1dd15dead0a5389371:/raw.c

diff --git a/raw.c b/raw.c
index 61061769..58b060c5 100644
--- a/raw.c
+++ b/raw.c
@@ -11,25 +11,26 @@
 #define TRUE 1
 #endif
 
+#define RAW_MAX_BACKLOG 4096
+
 static Socket s = NULL;
+static int raw_bufsize;
 
 static void raw_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 > RAW_MAX_BACKLOG);
 }
 
 static int raw_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);
@@ -43,18 +44,25 @@ static int raw_receive(Plug plug, int urgent, char *data, int len)
     return 1;
 }
 
+static void raw_sent(Plug plug, int bufsize)
+{
+    raw_bufsize = bufsize;
+}
+
 /*
  * Called to set up the raw 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 *raw_init(char *host, int port, char **realhost)
+static char *raw_init(char *host, int port, char **realhost, int nodelay)
 {
     static struct plug_function_table fn_table = {
 	raw_closing,
-	raw_receive
+	raw_receive,
+	raw_sent
     }, *fn_table_ptr = &fn_table;
 
     SockAddr addr;
@@ -63,6 +71,11 @@ static char *raw_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;
@@ -73,7 +86,13 @@ static char *raw_init(char *host, int port, char **realhost)
     /*
      * Open socket.
      */
-    s = sk_new(addr, port, 0, 1, &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 = new_connection(addr, *realhost, port, 0, 1, nodelay, &fn_table_ptr);
     if ((err = sk_socket_error(s)))
 	return err;
 
@@ -85,13 +104,22 @@ static char *raw_init(char *host, int port, char **realhost)
 /*
  * Called to send data down the raw connection.
  */
-static void raw_send(char *buf, int len)
+static int raw_send(char *buf, int len)
 {
-
     if (s == NULL)
-	return;
+	return 0;
+
+    raw_bufsize = sk_write(s, buf, len);
 
-    sk_write(s, buf, len);
+    return raw_bufsize;
+}
+
+/*
+ * Called to query the current socket sendability status.
+ */
+static int raw_sendbuffer(void)
+{
+    return raw_bufsize;
 }
 
 /*
@@ -122,6 +150,11 @@ static int raw_sendok(void)
     return 1;
 }
 
+static void raw_unthrottle(int backlog)
+{
+    sk_set_frozen(s, backlog > RAW_MAX_BACKLOG);
+}
+
 static int raw_ldisc(int option)
 {
     if (option == LD_EDIT || option == LD_ECHO)
@@ -129,13 +162,22 @@ static int raw_ldisc(int option)
     return 0;
 }
 
+static int raw_exitcode(void)
+{
+    /* Exit codes are a meaningless concept in the Raw protocol */
+    return 0;
+}
+
 Backend raw_backend = {
     raw_init,
     raw_send,
+    raw_sendbuffer,
     raw_size,
     raw_special,
     raw_socket,
+    raw_exitcode,
     raw_sendok,
     raw_ldisc,
+    raw_unthrottle,
     1
 };