X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/eb5e1db9a06a5daf08aca8aba34529d48641cdcb..fe50e8140a2dbb3ba357a0ab777f34e07d568c23:/telnet.c diff --git a/telnet.c b/telnet.c index 1cd4df47..7b6c0bf6 100644 --- a/telnet.c +++ b/telnet.c @@ -1,7 +1,13 @@ #include #include #include +#ifndef AUTO_WINSOCK +#ifdef WINSOCK_TWO +#include +#else #include +#endif +#endif #include "putty.h" @@ -133,10 +139,7 @@ static struct Opt *opts[] = { &o_we_sga, &o_they_sga, NULL }; -#if 0 static int in_synch; -#endif - static int sb_opt, sb_len; static char *sb_buf = NULL; static int sb_size = 0; @@ -168,17 +171,9 @@ static void s_write (void *buf, int len) { try_write(); } -static void c_write (char *buf, int len) { - while (len--) { - int new_head = (inbuf_head + 1) & INBUF_MASK; - if (new_head != inbuf_reap) { - inbuf[inbuf_head] = *buf++; - inbuf_head = new_head; - } else { - term_out(); - if( inbuf_head == inbuf_reap ) len++; else break; - } - } +static void c_write1(int c) { + char cc = (char)c; + from_backend(0, &cc, 1); } static void log_option (char *sender, int cmd, int option) { @@ -216,11 +211,8 @@ static void activate_option (struct Opt *o) { */ deactivate_option (o->option==TELOPT_NEW_ENVIRON ? &o_oenv : &o_nenv); } - if (o->option == TELOPT_ECHO) - { - cfg.ldisc_term = FALSE; + if (o->option == TELOPT_ECHO && cfg.ldisc_term) ldisc = &ldisc_simple; - } } static void refused_option (struct Opt *o) { @@ -229,11 +221,8 @@ static void refused_option (struct Opt *o) { send_opt (WILL, TELOPT_OLD_ENVIRON); o_oenv.state = REQUESTED; } - if (o->option == TELOPT_ECHO) - { - cfg.ldisc_term = TRUE; + if (o->option == TELOPT_ECHO && cfg.ldisc_term) ldisc = &ldisc_term; - } } static void proc_rec_opt (int cmd, int option) { @@ -393,7 +382,6 @@ static enum { } telnet_state = TOPLEVEL; static void do_telnet_read (char *buf, int len) { - unsigned char b[10]; while (len--) { int c = (unsigned char) *buf++; @@ -406,11 +394,20 @@ static void do_telnet_read (char *buf, int len) { else if (c == IAC) telnet_state = SEENIAC; else { - b[0] = c; -#if 0 if (!in_synch) + c_write1(c); + +#if 1 + /* I can't get the F***ing winsock to insert the urgent IAC + * into the right position! Even with SO_OOBINLINE it gives + * it to recv too soon. And of course the DM byte (that + * arrives in the same packet!) appears several K later!! + * + * Oh well, we do get the DM in the right place so I'll + * just stop hiding on the next 0xf2 and hope for the best. + */ + else if (c == DM) in_synch = 0; #endif - c_write (b, 1); if (c == CR) telnet_state = SEENCR; else @@ -423,11 +420,14 @@ static void do_telnet_read (char *buf, int len) { else if (c == WILL) telnet_state = SEENWILL; else if (c == WONT) telnet_state = SEENWONT; else if (c == SB) telnet_state = SEENSB; + else if (c == DM) { + in_synch = 0; + telnet_state = TOPLEVEL; + } else { /* ignore everything else; print it if it's IAC */ if (c == IAC) { - b[0] = c; - c_write(b,1); + c_write1(c); } telnet_state = TOPLEVEL; } @@ -462,8 +462,8 @@ static void do_telnet_read (char *buf, int len) { char *newbuf; sb_size += SB_DELTA; newbuf = (sb_buf ? - realloc(sb_buf, sb_size) : - malloc(sb_size)); + srealloc(sb_buf, sb_size) : + smalloc(sb_size)); if (newbuf) sb_buf = newbuf; else @@ -532,12 +532,10 @@ static char *telnet_init (HWND hwnd, char *host, int port, char **realhost) { default: return "socket(): unknown error"; } -#if 0 { BOOL b = TRUE; setsockopt (s, SOL_SOCKET, SO_OOBINLINE, (void *)&b, sizeof(b)); } -#endif /* * Bind to local address. @@ -565,7 +563,7 @@ static char *telnet_init (HWND hwnd, char *host, int port, char **realhost) { default: return "connect(): unknown error"; } - if (WSAAsyncSelect (s, hwnd, WM_NETEVENT, FD_READ | + 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"; @@ -592,12 +590,15 @@ static char *telnet_init (HWND hwnd, char *host, int port, char **realhost) { send_opt ((*o)->send, (*o)->option); } -#if 0 /* * Set up SYNCH state. */ in_synch = FALSE; -#endif + + /* + * We have no pre-session phase. + */ + begin_session(); return NULL; } @@ -608,7 +609,11 @@ static char *telnet_init (HWND hwnd, char *host, int port, char **realhost) { */ static int telnet_msg (WPARAM wParam, LPARAM lParam) { int ret; - char buf[256]; + /* This needs to be larger than the packet size now that inbuf + * cannot overflow, in fact the fewer calls we make to windows + * the faster we will run! + */ + char buf[16384]; /* * Because reading less than the whole of the available pending @@ -620,45 +625,41 @@ static int telnet_msg (WPARAM wParam, LPARAM lParam) { if (s == INVALID_SOCKET) return 1; - if (WSAGETSELECTERROR(lParam) != 0) + if (WSAGETSELECTERROR(lParam) != 0) { + closesocket(s); + s = INVALID_SOCKET; 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; - } -#if 0 - if (in_synch) { - BOOL i; - if (ioctlsocket (s, SIOCATMARK, &i) < 0) { - return -20000-WSAGetLastError(); - } - if (i) - in_synch = FALSE; + { + int clear_of_oob = 1; + + /* Don't check for error return; some shims don't support + * this ioctl. + */ + ioctlsocket (s, SIOCATMARK, &clear_of_oob); + + in_synch = !clear_of_oob; + + do { + 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; + } + do_telnet_read (buf, ret); + } while (in_synch); } -#endif - do_telnet_read (buf, ret); - return 1; - case FD_OOB: - do { - ret = recv(s, buf, sizeof(buf), 0); - } while (ret > 0); - telnet_state = TOPLEVEL; - do { - ret = recv(s, buf, 1, MSG_OOB); - if (ret > 0) - do_telnet_read (buf, ret); - } while (ret > 0); - if (ret < 0 && WSAGetLastError() != WSAEWOULDBLOCK) - return -30000-WSAGetLastError(); return 1; case FD_WRITE: if (outbuf_head != outbuf_reap) @@ -681,28 +682,7 @@ static void telnet_send (char *buf, int len) { return; p = buf; - if (cfg.ldisc_term) { - while (p < buf+len) { - char *q = p; - unsigned char * cstr = 0; - while (p < buf+len) { - if ((unsigned char)*p == IAC) { - cstr = iac; - break; - } - if (*p == '\r') { - if( p+1 >= buf+len || ( p[1] != '\n' && p[1] != '\0')) - { - cstr = cr; - break; - } - } - p++; - } - if (p!=q) s_write (q, p-q); - if (cstr) s_write (cstr,2), p++; - } - } else while (p < buf+len) { + while (p < buf+len) { char *q = p; while (iswritable((unsigned char)*p) && p < buf+len) p++; @@ -775,13 +755,26 @@ static void telnet_special (Telnet_Special code) { send_opt (o_echo.nsend, o_echo.option); } break; + case TS_PING: + if (o_they_sga.state == ACTIVE) { + b[1] = NOP; + s_write (b, 2); + } + break; } } +static SOCKET telnet_socket(void) { return s; } + +static int telnet_sendok(void) { return 1; } + Backend telnet_backend = { telnet_init, telnet_msg, telnet_send, telnet_size, - telnet_special + telnet_special, + telnet_socket, + telnet_sendok, + 23 };