Fixes for (Backend)->size() changes -- internal declarations didn't include

[u/mdw/putty] / raw.c

diff --git a/raw.c b/raw.c
index 04686f3..90fc8a8 100644 (file)
--- a/raw.c
+++ b/raw.c
@@ -11,28 +11,31 @@
 #define TRUE 1
 #endif
 
-static Socket s = NULL;
+#define RAW_MAX_BACKLOG 4096
 
-static void raw_size(void);
+static Socket s = NULL;
+static int raw_bufsize;
+static void *frontend;
 
-static int sb_opt, sb_len;
-static char *sb_buf = NULL;
-static int sb_size = 0;
-#define SB_DELTA 1024
+static void raw_size(int width, int height);
 
 static void c_write(char *buf, int len)
 {
-    from_backend(0, buf, len);
+    int backlog = from_backend(frontend, 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);
+       logevent(error_msg);
+       connection_fatal("%s", error_msg);
     }                                 /* Otherwise, the remote side closed the connection normally. */
     return 0;
 }
@@ -43,6 +46,11 @@ 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.
  * 
@@ -51,19 +59,28 @@ static int raw_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 *raw_init(char *host, int port, char **realhost)
+static char *raw_init(void *frontend_handle, 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;
     char *err;
 
+    frontend = frontend_handle;
+
     /*
      * 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;
@@ -74,7 +91,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;
 
@@ -86,19 +109,28 @@ 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);
+
+    return raw_bufsize;
+}
 
-    sk_write(s, buf, len);
+/*
+ * Called to query the current socket sendability status.
+ */
+static int raw_sendbuffer(void)
+{
+    return raw_bufsize;
 }
 
 /*
  * Called to set the size of the window
  */
-static void raw_size(void)
+static void raw_size(int width, int height)
 {
     /* Do nothing! */
     return;
@@ -123,6 +155,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)
@@ -130,13 +167,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
 };