X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/8d5de7770cde9b808c276bd86a0214189a8f7578..HEAD:/raw.c

diff --git a/raw.c b/raw.c
index dd0f64a1..1d9f854c 100644
--- a/raw.c
+++ b/raw.c
@@ -1,7 +1,10 @@
-#include <windows.h>
+/*
+ * "Raw" backend.
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
-#include <winsock.h>
+#include <limits.h>
 
 #include "putty.h"
 
@@ -12,77 +15,158 @@
 #define TRUE 1
 #endif
 
-static SOCKET s = INVALID_SOCKET;
+#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 closed_on_socket_error;
+    int bufsize;
+    void *frontend;
+    int sent_console_eof, sent_socket_eof;
+} *Raw;
 
-static void raw_size(void);
+static void raw_size(void *handle, int width, int height);
 
-static int sb_opt, sb_len;
-static char *sb_buf = NULL;
-static int sb_size = 0;
-#define SB_DELTA 1024
+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 void raw_log(Plug plug, int type, SockAddr addr, int port,
+		    const char *error_msg, int error_code)
+{
+    Raw raw = (Raw) plug;
+    char addrbuf[256], *msg;
+
+    sk_getaddr(addr, addrbuf, lenof(addrbuf));
 
-static void try_write (void) {
-    while (outbuf_head != outbuf_reap) {
-	int end = (outbuf_reap < outbuf_head ? outbuf_head : OUTBUF_SIZE);
-	int len = end - outbuf_reap;
-	int ret;
+    if (type == 0)
+	msg = dupprintf("Connecting to %s port %d", addrbuf, port);
+    else
+	msg = dupprintf("Failed to connect to %s: %s", addrbuf, error_msg);
+
+    logevent(raw->frontend, msg);
+    sfree(msg);
+}
 
-	ret = send (s, outbuf+outbuf_reap, len, 0);
-	if (ret > 0)
-	    outbuf_reap = (outbuf_reap + ret) & OUTBUF_MASK;
-	if (ret < len)
-	    return;
+static void raw_check_close(Raw raw)
+{
+    /*
+     * Called after we send EOF on either the socket or the console.
+     * Its job is to wind up the session once we have sent EOF on both.
+     */
+    if (raw->sent_console_eof && raw->sent_socket_eof) {
+        if (raw->s) {
+            sk_close(raw->s);
+            raw->s = NULL;
+            notify_remote_exit(raw->frontend);
+        }
     }
 }
 
-static void s_write (void *buf, int len) {
-    unsigned char *p = buf;
-    while (len--) {
-	int new_head = (outbuf_head + 1) & OUTBUF_MASK;
-	if (new_head != outbuf_reap) {
-	    outbuf[outbuf_head] = *p++;
-	    outbuf_head = new_head;
-	}
+static int raw_closing(Plug plug, const char *error_msg, int error_code,
+		       int calling_back)
+{
+    Raw raw = (Raw) plug;
+
+    if (error_msg) {
+        /* A socket error has occurred. */
+        if (raw->s) {
+            sk_close(raw->s);
+            raw->s = NULL;
+            raw->closed_on_socket_error = TRUE;
+            notify_remote_exit(raw->frontend);
+        }
+        logevent(raw->frontend, error_msg);
+        connection_fatal(raw->frontend, "%s", error_msg);
+    } else {
+        /* Otherwise, the remote side closed the connection normally. */
+        if (!raw->sent_console_eof && from_backend_eof(raw->frontend)) {
+            /*
+             * The front end wants us to close the outgoing side of the
+             * connection as soon as we see EOF from the far end.
+             */
+            if (!raw->sent_socket_eof) {
+                if (raw->s)
+                    sk_write_eof(raw->s);
+                raw->sent_socket_eof= TRUE;
+            }
+        }
+        raw->sent_console_eof = TRUE;
+        raw_check_close(raw);
     }
-    try_write();
+    return 0;
 }
 
-static void c_write (char *buf, int len) {
-    while (len--) 
-        c_write1(*buf++);
+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. Will arrange for
- * WM_NETEVENT messages to be passed to the specified window, whose
- * window procedure should then call raw_msg().
- *
+ * 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 (HWND hwnd, char *host, int port, char **realhost) {
-    SOCKADDR_IN addr;
-    struct hostent *h;
-    unsigned long a;
+static const char *raw_init(void *frontend_handle, void **backend_handle,
+			    Conf *conf,
+			    char *host, int port, char **realhost, int nodelay,
+			    int keepalive)
+{
+    static const struct plug_function_table fn_table = {
+	raw_log,
+	raw_closing,
+	raw_receive,
+	raw_sent
+    };
+    SockAddr addr;
+    const char *err;
+    Raw raw;
+    int addressfamily;
+    char *loghost;
 
+    raw = snew(struct raw_backend_data);
+    raw->fn = &fn_table;
+    raw->s = NULL;
+    raw->closed_on_socket_error = FALSE;
+    *backend_handle = raw;
+    raw->sent_console_eof = raw->sent_socket_eof = FALSE;
+
+    raw->frontend = frontend_handle;
+
+    addressfamily = conf_get_int(conf, CONF_addressfamily);
     /*
      * Try to find host.
      */
-    if ( (a = inet_addr(host)) == (unsigned long) INADDR_NONE) {
-	if ( (h = gethostbyname(host)) == NULL)
-	    switch (WSAGetLastError()) {
-	      case WSAENETDOWN: return "Network is down";
-	      case WSAHOST_NOT_FOUND: case WSANO_DATA:
-		return "Host does not exist";
-	      case WSATRY_AGAIN: return "Host not found";
-	      default: return "gethostbyname: unknown error";
-	    }
-	memcpy (&a, h->h_addr, sizeof(a));
-	*realhost = h->h_name;
-    } else
-	*realhost = host;
-    a = ntohl(a);
+    {
+	char *buf;
+	buf = dupprintf("Looking up host \"%s\"%s", host,
+			(addressfamily == ADDRTYPE_IPV4 ? " (IPv4)" :
+			 (addressfamily == ADDRTYPE_IPV6 ? " (IPv6)" :
+			  "")));
+	logevent(raw->frontend, buf);
+	sfree(buf);
+    }
+    addr = name_lookup(host, port, realhost, conf, addressfamily);
+    if ((err = sk_addr_error(addr)) != NULL) {
+	sk_addr_free(addr);
+	return err;
+    }
 
     if (port < 0)
 	port = 23;		       /* default telnet port */
@@ -90,147 +174,176 @@ static char *raw_init (HWND hwnd, char *host, int port, char **realhost) {
     /*
      * Open socket.
      */
-    s = socket(AF_INET, SOCK_STREAM, 0);
-    if (s == INVALID_SOCKET)
-	switch (WSAGetLastError()) {
-	  case WSAENETDOWN: return "Network is down";
-	  case WSAEAFNOSUPPORT: return "TCP/IP support not present";
-	  default: return "socket(): unknown error";
-	}
+    raw->s = new_connection(addr, *realhost, port, 0, 1, nodelay, keepalive,
+			    (Plug) raw, conf);
+    if ((err = sk_socket_error(raw->s)) != NULL)
+	return err;
 
-    /*
-     * Bind to local address.
-     */
-    addr.sin_family = AF_INET;
-    addr.sin_addr.s_addr = htonl(INADDR_ANY);
-    addr.sin_port = htons(0);
-    if (bind (s, (struct sockaddr *)&addr, sizeof(addr)) == SOCKET_ERROR)
-	switch (WSAGetLastError()) {
-	  case WSAENETDOWN: return "Network is down";
-	  default: return "bind(): unknown error";
-	}
+    loghost = conf_get_str(conf, CONF_loghost);
+    if (*loghost) {
+	char *colon;
 
-    /*
-     * Connect to remote address.
-     */
-    addr.sin_addr.s_addr = htonl(a);
-    addr.sin_port = htons((short)port);
-    if (connect (s, (struct sockaddr *)&addr, sizeof(addr)) == SOCKET_ERROR)
-	switch (WSAGetLastError()) {
-	  case WSAENETDOWN: return "Network is down";
-	  case WSAECONNREFUSED: return "Connection refused";
-	  case WSAENETUNREACH: return "Network is unreachable";
-	  case WSAEHOSTUNREACH: return "No route to host";
-	  default: return "connect(): unknown error";
-	}
-
-    if (hwnd && WSAAsyncSelect (s, hwnd, WM_NETEVENT, FD_READ |
-			FD_WRITE | FD_OOB | FD_CLOSE) == SOCKET_ERROR)
-	switch (WSAGetLastError()) {
-	  case WSAENETDOWN: return "Network is down";
-	  default: return "WSAAsyncSelect(): unknown error";
+	sfree(*realhost);
+	*realhost = dupstr(loghost);
+	colon = strrchr(*realhost, ':');
+	if (colon) {
+	    /*
+	     * FIXME: if we ever update this aspect of ssh.c for
+	     * IPv6 literal management, this should change in line
+	     * with it.
+	     */
+	    *colon++ = '\0';
 	}
+    }
 
     return NULL;
 }
 
-/*
- * Process a WM_NETEVENT message. Will return 0 if the connection
- * has closed, or <0 for a socket error.
- */
-static int raw_msg (WPARAM wParam, LPARAM lParam) {
-    int ret;
-    char buf[256];
+static void raw_free(void *handle)
+{
+    Raw raw = (Raw) handle;
 
-    /*
-     * Because reading less than the whole of the available pending
-     * data can generate an FD_READ event, we need to allow for the
-     * possibility that FD_READ may arrive with FD_CLOSE already in
-     * the queue; so it's possible that we can get here even with s
-     * invalid. If so, we return 1 and don't worry about it.
-     */
-    if (s == INVALID_SOCKET) {
-        closesocket(s);
-        s = INVALID_SOCKET;
-	return 1;
-    }
+    if (raw->s)
+	sk_close(raw->s);
+    sfree(raw);
+}
 
-    if (WSAGETSELECTERROR(lParam) != 0)
-	return -WSAGETSELECTERROR(lParam);
-
-    switch (WSAGETSELECTEVENT(lParam)) {
-      case FD_READ:
-      case FD_CLOSE:
-	ret = recv(s, buf, sizeof(buf), 0);
-	if (ret < 0 && WSAGetLastError() == WSAEWOULDBLOCK)
-	    return 1;
-	if (ret < 0) {		       /* any _other_ error */
-            closesocket(s);
-            s = INVALID_SOCKET;
-	    return -10000-WSAGetLastError();
-        }
-	if (ret == 0) {
-	    s = INVALID_SOCKET;
-	    return 0;
-	}
-	c_write( buf, ret );
-	return 1;
-      case FD_OOB:
-	do {
-	    ret = recv(s, buf, sizeof(buf), 0);
-	    c_write( buf, ret );
-	} while (ret > 0);
-	do {
-	    ret = recv(s, buf, 1, MSG_OOB);
-	} while (ret > 0);
-	if (ret < 0 && WSAGetLastError() != WSAEWOULDBLOCK)
-	    return -30000-WSAGetLastError();
-	return 1;
-      case FD_WRITE:
-	if (outbuf_head != outbuf_reap)
-	    try_write();
-	return 1;
-    }
-    return 1;			       /* shouldn't happen, but WTF */
+/*
+ * Stub routine (we don't have any need to reconfigure this backend).
+ */
+static void raw_reconfig(void *handle, Conf *conf)
+{
 }
 
 /*
  * 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 (raw->s == NULL)
+	return 0;
 
-    if (s == INVALID_SOCKET)
-	return;
+    raw->bufsize = sk_write(raw->s, buf, len);
 
-    s_write( 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;
 }
 
 /*
- * Send raw special codes.
+ * Send raw special codes. We only handle outgoing EOF here.
  */
-static void raw_special (Telnet_Special code) {
-    /* Do nothing! */
+static void raw_special(void *handle, Telnet_Special code)
+{
+    Raw raw = (Raw) handle;
+    if (code == TS_EOF && raw->s) {
+        sk_write_eof(raw->s);
+        raw->sent_socket_eof= TRUE;
+        raw_check_close(raw);
+    }
+
     return;
 }
 
-static SOCKET raw_socket(void) { return s; }
+/*
+ * Return a list of the special codes that make sense in this
+ * protocol.
+ */
+static const struct telnet_special *raw_get_specials(void *handle)
+{
+    return NULL;
+}
+
+static int raw_connected(void *handle)
+{
+    Raw raw = (Raw) handle;
+    return raw->s != NULL;
+}
+
+static int raw_sendok(void *handle)
+{
+    return 1;
+}
+
+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 0;
+}
 
-static int raw_sendok(void) { return 1; }
+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)
+{
+    Raw raw = (Raw) handle;
+    if (raw->s != NULL)
+        return -1;                     /* still connected */
+    else if (raw->closed_on_socket_error)
+        return INT_MAX;     /* a socket error counts as an unclean exit */
+    else
+        /* Exit codes are a meaningless concept in the Raw protocol */
+        return 0;
+}
+
+/*
+ * cfg_info for Raw does nothing at all.
+ */
+static int raw_cfg_info(void *handle)
+{
+    return 0;
+}
 
 Backend raw_backend = {
     raw_init,
-    raw_msg,
+    raw_free,
+    raw_reconfig,
     raw_send,
+    raw_sendbuffer,
     raw_size,
     raw_special,
-    raw_socket,
-    raw_sendok
+    raw_get_specials,
+    raw_connected,
+    raw_exitcode,
+    raw_sendok,
+    raw_ldisc,
+    raw_provide_ldisc,
+    raw_provide_logctx,
+    raw_unthrottle,
+    raw_cfg_info,
+    "raw",
+    PROT_RAW,
+    0
 };