Attempt to ensure that everything passed to connection_fatal() is

[u/mdw/putty] / raw.c

diff --git a/raw.c b/raw.c
index 9cbb606..20732dd 100644 (file)
--- a/raw.c
+++ b/raw.c
@@ -11,53 +11,74 @@
 #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);
+static void c_write(char *buf, int len)
+{
+    int backlog = from_backend(0, buf, len);
+    sk_set_frozen(s, backlog > RAW_MAX_BACKLOG);
 }
 
-static int raw_receive (Socket skt, int urgent, char *data, int len) {
-    if (urgent==3) {
-        /* A socket error has occurred. */
+static int raw_closing(Plug plug, char *error_msg, int error_code,
+                      int calling_back)
+{
+    if (s) {
         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;
     }
+    if (error_msg) {
+       /* A socket error has occurred. */
+       logevent(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)
+{
     c_write(data, 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_sent
+    }, *fn_table_ptr = &fn_table;
+
     SockAddr addr;
     char *err;
 
     /*
      * 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)) )
+    if ((err = sk_addr_error(addr)))
        return err;
 
     if (port < 0)
@@ -66,8 +87,14 @@ static char *raw_init (char *host, int port, char **realhost) {
     /*
      * Open socket.
      */
-    s = sk_new(addr, port, 0, 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(buf);
+    }
+    s = new_connection(addr, *realhost, port, 0, 1, nodelay, &fn_table_ptr);
+    if ((err = sk_socket_error(s)))
        return err;
 
     sk_addr_free(addr);
@@ -78,18 +105,29 @@ 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;
 
-    sk_write(s, buf, len);
+    raw_bufsize = sk_write(s, buf, len);
+
+    return raw_bufsize;
+}
+
+/*
+ * 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(void)
+{
     /* Do nothing! */
     return;
 }
@@ -97,28 +135,50 @@ static void raw_size(void) {
 /*
  * Send raw special codes.
  */
-static void raw_special (Telnet_Special code) {
+static void raw_special(Telnet_Special code)
+{
     /* Do nothing! */
     return;
 }
 
-static Socket raw_socket(void) { return s; }
+static Socket raw_socket(void)
+{
+    return s;
+}
 
-static int raw_sendok(void) { return 1; }
+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) {
+static int raw_ldisc(int option)
+{
     if (option == LD_EDIT || option == LD_ECHO)
-        return 1;
+       return 1;
+    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
 };