X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/ca2d59436752b1d46a12d4d4fabd366fac81b0ca..8df7a775f6f8b0f81f84eafe28cd0bb8d4c6d1f4:/raw.c diff --git a/raw.c b/raw.c index 3f82d7ad..833f8432 100644 --- a/raw.c +++ b/raw.c @@ -1,13 +1,6 @@ #include #include #include -#ifndef AUTO_WINSOCK -#ifdef WINSOCK_TWO -#include -#else -#include -#endif -#endif #include "putty.h" @@ -18,7 +11,7 @@ #define TRUE 1 #endif -static SOCKET s = INVALID_SOCKET; +static Socket s = NULL; static void raw_size(void); @@ -27,67 +20,38 @@ 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) { + from_backend(0, buf, len); } -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_receive (Socket s, int urgent, char *data, int len) { + if (!len) { + /* Connection has closed. */ + sk_close(s); + s = NULL; + return 0; } - try_write(); -} - -static void c_write (char *buf, int len) { - from_backend(0, buf, 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'. */ -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) { + 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 */ @@ -95,46 +59,11 @@ 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, raw_receive); + 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); /* * We have no pre-session phase. @@ -145,74 +74,14 @@ static char *raw_init (HWND hwnd, char *host, int port, char **realhost) { } /* - * 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]; - - /* - * 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 (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 */ -} - -/* * Called to send data down the raw connection. */ static void raw_send (char *buf, int len) { - if (s == INVALID_SOCKET) + if (s == NULL) return; - s_write( buf, len ); + sk_write(s, buf, len); } /* @@ -231,13 +100,12 @@ static void raw_special (Telnet_Special code) { return; } -static SOCKET raw_socket(void) { return s; } +static Socket raw_socket(void) { return s; } static int raw_sendok(void) { return 1; } Backend raw_backend = { raw_init, - raw_msg, raw_send, raw_size, raw_special,