X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/4017be6d5375063f59b63474490ac072e7f09b1a..5471d09ad63fc6216fb9c2a3b52ca9c93821a054:/raw.c diff --git a/raw.c b/raw.c index 2c3e8522..52e4b06c 100644 --- a/raw.c +++ b/raw.c @@ -1,7 +1,6 @@ #include #include #include -#include #include "putty.h" @@ -12,77 +11,63 @@ #define TRUE 1 #endif -static SOCKET s = INVALID_SOCKET; +#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 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; - - ret = send (s, outbuf+outbuf_reap, len, 0); - if (ret > 0) - outbuf_reap = (outbuf_reap + ret) & OUTBUF_MASK; - if (ret < len) - return; - } +static void c_write(char *buf, int len) +{ + int backlog = from_backend(0, buf, len); + sk_set_frozen(s, backlog > RAW_MAX_BACKLOG); } -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, char *error_msg, int error_code, + int calling_back) +{ + if (s) { + sk_close(s); + s = NULL; } - try_write(); + if (error_msg) { + /* A socket error has occurred. */ + connection_fatal(error_msg); + } /* Otherwise, the remote side closed the connection normally. */ + 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) +{ + c_write(data, len); + return 1; } /* - * 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 char *raw_init(char *host, int port, char **realhost) +{ + static struct plug_function_table fn_table = { + raw_closing, + raw_receive + }, *fn_table_ptr = &fn_table; + + SockAddr addr; + char *err; /* * 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); + addr = sk_namelookup(host, realhost); + if ((err = sk_addr_error(addr))) + return err; if (port < 0) port = 23; /* default telnet port */ @@ -90,119 +75,42 @@ 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"; - } + s = sk_new(addr, port, 0, 1, &fn_table_ptr); + if ((err = sk_socket_error(s))) + 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"; - } - - /* - * 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"; - } + sk_addr_free(addr); return NULL; } /* - * Process a WM_NETEVENT message. Will return 0 if the connection - * has closed, or <0 for a socket error. + * Called to send data down the raw connection. */ -static int raw_msg (WPARAM wParam, LPARAM lParam) { - int ret; - char buf[256]; +static int raw_send(char *buf, int len) +{ - /* - * 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) - return 1; + if (s == NULL) + return; - 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 */ - 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 */ + raw_bufsize = sk_write(s, buf, len); + + return raw_bufsize; } /* - * Called to send data down the raw connection. + * Called to query the current socket sendability status. */ -static void raw_send (char *buf, int len) { - - if (s == INVALID_SOCKET) - return; - - s_write( buf, len ); +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; } @@ -210,18 +118,43 @@ 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; } -SOCKET raw_socket(void) { return s; } +static Socket raw_socket(void) +{ + return s; +} + +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) + return 1; + return 0; +} Backend raw_backend = { raw_init, - raw_msg, raw_send, + raw_sendbuffer, raw_size, raw_special, - raw_socket + raw_socket, + raw_sendok, + raw_ldisc, + raw_unthrottle, + 1 };