Yet more global-removal. The static variables in logging.c are now

[u/mdw/putty] / raw.c

diff --git a/raw.c b/raw.c
index e3d5c06..049b851 100644 (file)
--- a/raw.c
+++ b/raw.c
@@ -11,53 +11,92 @@
 #define TRUE 1
 #endif
 
-static Socket s = NULL;
-
-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);
-}
-
-static int raw_receive (Socket skt, int urgent, char *data, int len) {
-    if (urgent==3) {
-        /* A socket error has occurred. */
-        sk_close(s);
-        s = NULL;
-        connection_fatal(data);
-        len = 0;
-        return 0;
-    } else if (!len) {
-       /* Connection has closed. */
-       sk_close(s);
-       s = NULL;
-       return 0;
+#define RAW_MAX_BACKLOG 4096
+
+typedef struct raw_backend_data {
+    const struct plug_function_table *fn;
+    /* the above field _must_ be first in the structure */
+
+    Socket s;
+    int bufsize;
+    void *frontend;
+} *Raw;
+
+static void raw_size(void *handle, int width, int height);
+
+static void c_write(Raw raw, char *buf, int len)
+{
+    int backlog = from_backend(raw->frontend, 0, buf, len);
+    sk_set_frozen(raw->s, backlog > RAW_MAX_BACKLOG);
+}
+
+static int raw_closing(Plug plug, char *error_msg, int error_code,
+                      int calling_back)
+{
+    Raw raw = (Raw) plug;
+
+    if (raw->s) {
+        sk_close(raw->s);
+        raw->s = NULL;
     }
-    c_write(data, len);
+    if (error_msg) {
+       /* A socket error has occurred. */
+       logevent(raw->frontend, error_msg);
+       connection_fatal("%s", error_msg);
+    }                                 /* Otherwise, the remote side closed the connection normally. */
+    return 0;
+}
+
+static int raw_receive(Plug plug, int urgent, char *data, int len)
+{
+    Raw raw = (Raw) plug;
+    c_write(raw, data, len);
     return 1;
 }
 
+static void raw_sent(Plug plug, int bufsize)
+{
+    Raw raw = (Raw) plug;
+    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(void *frontend_handle, void **backend_handle,
+                     char *host, int port, char **realhost, int nodelay)
+{
+    static const struct plug_function_table fn_table = {
+       raw_closing,
+       raw_receive,
+       raw_sent
+    };
     SockAddr addr;
     char *err;
+    Raw raw;
+
+    raw = smalloc(sizeof(*raw));
+    raw->fn = &fn_table;
+    raw->s = NULL;
+    *backend_handle = raw;
+
+    raw->frontend = frontend_handle;
 
     /*
      * Try to find host.
      */
+    {
+       char buf[200];
+       sprintf(buf, "Looking up host \"%.170s\"", host);
+       logevent(raw->frontend, buf);
+    }
     addr = sk_namelookup(host, realhost);
-    if ( (err = sk_addr_error(addr)) )
+    if ((err = sk_addr_error(addr)))
        return err;
 
     if (port < 0)
@@ -66,8 +105,14 @@ static char *raw_init (char *host, int port, char **realhost) {
     /*
      * Open socket.
      */
-    s = sk_new(addr, port, 0, 1, raw_receive);
-    if ( (err = sk_socket_error(s)) )
+    {
+       char buf[200], addrbuf[100];
+       sk_getaddr(addr, addrbuf, 100);
+       sprintf(buf, "Connecting to %.100s port %d", addrbuf, port);
+       logevent(raw->frontend, buf);
+    }
+    raw->s = new_connection(addr, *realhost, port, 0, 1, nodelay, (Plug) raw);
+    if ((err = sk_socket_error(raw->s)))
        return err;
 
     sk_addr_free(addr);
@@ -78,18 +123,32 @@ 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(void *handle, char *buf, int len)
+{
+    Raw raw = (Raw) handle;
 
-    if (s == NULL)
-       return;
+    if (raw->s == NULL)
+       return 0;
 
-    sk_write(s, buf, len);
+    raw->bufsize = sk_write(raw->s, buf, len);
+
+    return raw->bufsize;
+}
+
+/*
+ * Called to query the current socket sendability status.
+ */
+static int raw_sendbuffer(void *handle)
+{
+    Raw raw = (Raw) handle;
+    return raw->bufsize;
 }
 
 /*
  * Called to set the size of the window
  */
-static void raw_size(void) {
+static void raw_size(void *handle, int width, int height)
+{
     /* Do nothing! */
     return;
 }
@@ -97,28 +156,64 @@ static void raw_size(void) {
 /*
  * Send raw special codes.
  */
-static void raw_special (Telnet_Special code) {
+static void raw_special(void *handle, Telnet_Special code)
+{
     /* Do nothing! */
     return;
 }
 
-static Socket raw_socket(void) { return s; }
+static Socket raw_socket(void *handle)
+{
+    Raw raw = (Raw) handle;
+    return raw->s;
+}
 
-static int raw_sendok(void) { return 1; }
+static int raw_sendok(void *handle)
+{
+    return 1;
+}
 
-static int raw_ldisc(int option) {
+static void raw_unthrottle(void *handle, int backlog)
+{
+    Raw raw = (Raw) handle;
+    sk_set_frozen(raw->s, backlog > RAW_MAX_BACKLOG);
+}
+
+static int raw_ldisc(void *handle, int option)
+{
     if (option == LD_EDIT || option == LD_ECHO)
-        return 1;
+       return 1;
+    return 0;
+}
+
+static void raw_provide_ldisc(void *handle, void *ldisc)
+{
+    /* This is a stub. */
+}
+
+static void raw_provide_logctx(void *handle, void *logctx)
+{
+    /* This is a stub. */
+}
+
+static int raw_exitcode(void *handle)
+{
+    /* 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_provide_ldisc,
+    raw_provide_logctx,
+    raw_unthrottle,
     1
 };