diff options
Diffstat (limited to 'release/src/router/busybox/networking/telnet.c')
| -rw-r--r-- | release/src/router/busybox/networking/telnet.c | 736 |
1 files changed, 347 insertions, 389 deletions
diff --git a/release/src/router/busybox/networking/telnet.c b/release/src/router/busybox/networking/telnet.c index 88607f65..cc994250 100644 --- a/release/src/router/busybox/networking/telnet.c +++ b/release/src/router/busybox/networking/telnet.c @@ -8,19 +8,7 @@ * Created: Thu Apr 7 13:29:41 1994 too * Last modified: Fri Jun 9 14:34:24 2000 too * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. * * HISTORY * Revision 3.1 1994/04/17 11:31:54 too @@ -28,55 +16,32 @@ * Modified 2000/06/13 for inclusion into BusyBox by Erik Andersen <andersen@codepoet.org> * Modified 2001/05/07 to add ability to pass TTYPE to remote host by Jim McQuillan * <jam@ltsp.org> + * Modified 2004/02/11 to add ability to pass the USER variable to remote host + * by Fernando Silveira <swrh@gmx.net> * */ -#include <termios.h> -#include <unistd.h> -#include <errno.h> -#include <stdlib.h> -#include <stdarg.h> -#include <string.h> -#include <signal.h> #include <arpa/telnet.h> -#include <sys/types.h> -#include <sys/socket.h> #include <netinet/in.h> -#include "busybox.h" - -#ifdef CONFIG_FEATURE_AUTOWIDTH -# include <sys/ioctl.h> -#endif - -#if 0 -static const int DOTRACE = 1; -#endif +#include "libbb.h" #ifdef DOTRACE -#include <arpa/inet.h> /* for inet_ntoa()... */ #define TRACE(x, y) do { if (x) printf y; } while (0) #else -#define TRACE(x, y) -#endif - -#if 0 -#define USE_POLL -#include <sys/poll.h> -#else -#include <sys/time.h> +#define TRACE(x, y) #endif -#define DATABUFSIZE 128 -#define IACBUFSIZE 128 +enum { + DATABUFSIZE = 128, + IACBUFSIZE = 128, -static const int CHM_TRY = 0; -static const int CHM_ON = 1; -static const int CHM_OFF = 2; + CHM_TRY = 0, + CHM_ON = 1, + CHM_OFF = 2, -static const int UF_ECHO = 0x01; -static const int UF_SGA = 0x02; + UF_ECHO = 0x01, + UF_SGA = 0x02, -enum { TS_0 = 1, TS_IAC = 2, TS_OPT = 3, @@ -84,39 +49,40 @@ enum { TS_SUB2 = 5, }; -#define WriteCS(fd, str) write(fd, str, sizeof str -1) - typedef unsigned char byte; -/* use globals to reduce size ??? */ /* test this hypothesis later */ -static struct Globalvars { - int netfd; /* console fd:s are 0 and 1 (and 2) */ - /* same buffer used both for network and console read/write */ - char buf[DATABUFSIZE]; /* allocating so static size is smaller */ +enum { netfd = 3 }; + +struct globals { + int iaclen; /* could even use byte, but it's a loss on x86 */ byte telstate; /* telnet negotiation state from network input */ byte telwish; /* DO, DONT, WILL, WONT */ byte charmode; byte telflags; - byte gotsig; + byte do_termios; +#if ENABLE_FEATURE_TELNET_TTYPE + char *ttype; +#endif +#if ENABLE_FEATURE_TELNET_AUTOLOGIN + const char *autologin; +#endif +#if ENABLE_FEATURE_AUTOWIDTH + unsigned win_width, win_height; +#endif + /* same buffer used both for network and console read/write */ + char buf[DATABUFSIZE]; /* buffer to handle telnet negotiations */ char iacbuf[IACBUFSIZE]; - short iaclen; /* could even use byte */ - struct termios termios_def; - struct termios termios_raw; -} G; - -#define xUSE_GLOBALVAR_PTR /* xUSE... -> don't use :D (makes smaller code) */ - -#ifdef USE_GLOBALVAR_PTR -struct Globalvars * Gptr; -#define G (*Gptr) -#endif - -static inline void iacflush(void) -{ - write(G.netfd, G.iacbuf, G.iaclen); - G.iaclen = 0; -} + struct termios termios_def; + struct termios termios_raw; +}; +#define G (*(struct globals*)&bb_common_bufsiz1) +void BUG_telnet_globals_too_big(void); +#define INIT_G() do { \ + if (sizeof(G) > COMMON_BUFSIZE) \ + BUG_telnet_globals_too_big(); \ + /* memset(&G, 0, sizeof G); - already is */ \ +} while (0) /* Function prototypes */ static void rawmode(void); @@ -126,53 +92,48 @@ static void will_charmode(void); static void telopt(byte c); static int subneg(byte c); -/* Some globals */ -static int one = 1; - -#ifdef CONFIG_FEATURE_TELNET_TTYPE -static char *ttype; -#endif +static void iac_flush(void) +{ + write(netfd, G.iacbuf, G.iaclen); + G.iaclen = 0; +} -#ifdef CONFIG_FEATURE_AUTOWIDTH -static int win_width, win_height; -#endif +#define write_str(fd, str) write(fd, str, sizeof(str) - 1) +static void doexit(int ev) NORETURN; static void doexit(int ev) { cookmode(); exit(ev); -} +} -static void conescape(void) +static void con_escape(void) { char b; - if (G.gotsig) /* came from line mode... go raw */ + if (bb_got_signal) /* came from line mode... go raw */ rawmode(); - WriteCS(1, "\r\nConsole escape. Commands are:\r\n\n" + write_str(1, "\r\nConsole escape. Commands are:\r\n\n" " l go to line mode\r\n" " c go to character mode\r\n" " z suspend telnet\r\n" " e exit telnet\r\n"); - if (read(0, &b, 1) <= 0) - doexit(1); + if (read(STDIN_FILENO, &b, 1) <= 0) + doexit(EXIT_FAILURE); - switch (b) - { + switch (b) { case 'l': - if (!G.gotsig) - { + if (!bb_got_signal) { do_linemode(); - goto rrturn; + goto ret; } break; case 'c': - if (G.gotsig) - { + if (bb_got_signal) { will_charmode(); - goto rrturn; + goto ret; } break; case 'z': @@ -181,222 +142,219 @@ static void conescape(void) rawmode(); break; case 'e': - doexit(0); + doexit(EXIT_SUCCESS); } - WriteCS(1, "continuing...\r\n"); + write_str(1, "continuing...\r\n"); - if (G.gotsig) + if (bb_got_signal) cookmode(); - - rrturn: - G.gotsig = 0; - + ret: + bb_got_signal = 0; + } -static void handlenetoutput(int len) + +static void handle_net_output(int len) { - /* here we could do smart tricks how to handle 0xFF:s in output - * stream like writing twice every sequence of FF:s (thus doing - * many write()s. But I think interactive telnet application does - * not need to be 100% 8-bit clean, so changing every 0xff:s to - * 0x7f:s + /* here we could do smart tricks how to handle 0xFF:s in output + * stream like writing twice every sequence of FF:s (thus doing + * many write()s. But I think interactive telnet application does + * not need to be 100% 8-bit clean, so changing every 0xff:s to + * 0x7f:s * - * 2002-mar-21, Przemyslaw Czerpak (druzus@polbox.com) - * I don't agree. - * first - I cannot use programs like sz/rz - * second - the 0x0D is sent as one character and if the next - * char is 0x0A then it's eaten by a server side. - * third - whay doy you have to make 'many write()s'? - * I don't understand. - * So I implemented it. It's realy useful for me. I hope that - * others people will find it interesting to. + * 2002-mar-21, Przemyslaw Czerpak (druzus@polbox.com) + * I don't agree. + * first - I cannot use programs like sz/rz + * second - the 0x0D is sent as one character and if the next + * char is 0x0A then it's eaten by a server side. + * third - why do you have to make 'many write()s'? + * I don't understand. + * So I implemented it. It's really useful for me. I hope that + * other people will find it interesting too. */ int i, j; - byte * p = G.buf; + byte *p = (byte*)G.buf; byte outbuf[4*DATABUFSIZE]; - for (i = len, j = 0; i > 0; i--, p++) - { - if (*p == 0x1d) - { - conescape(); + for (i = len, j = 0; i > 0; i--, p++) { + if (*p == 0x1d) { + con_escape(); return; } outbuf[j++] = *p; if (*p == 0xff) - outbuf[j++] = 0xff; + outbuf[j++] = 0xff; else if (*p == 0x0d) - outbuf[j++] = 0x00; + outbuf[j++] = 0x00; } - if (j > 0 ) - write(G.netfd, outbuf, j); + if (j > 0) + write(netfd, outbuf, j); } - -static void handlenetinput(int len) +static void handle_net_input(int len) { int i; int cstart = 0; - for (i = 0; i < len; i++) - { + for (i = 0; i < len; i++) { byte c = G.buf[i]; - if (G.telstate == 0) /* most of the time state == 0 */ - { - if (c == IAC) - { + if (G.telstate == 0) { /* most of the time state == 0 */ + if (c == IAC) { cstart = i; G.telstate = TS_IAC; } + continue; } - else - switch (G.telstate) - { - case TS_0: - if (c == IAC) - G.telstate = TS_IAC; - else - G.buf[cstart++] = c; - break; - - case TS_IAC: - if (c == IAC) /* IAC IAC -> 0xFF */ - { - G.buf[cstart++] = c; - G.telstate = TS_0; - break; - } - /* else */ - switch (c) - { - case SB: - G.telstate = TS_SUB1; - break; - case DO: - case DONT: - case WILL: - case WONT: - G.telwish = c; - G.telstate = TS_OPT; - break; - default: - G.telstate = TS_0; /* DATA MARK must be added later */ - } - break; - case TS_OPT: /* WILL, WONT, DO, DONT */ - telopt(c); - G.telstate = TS_0; - break; - case TS_SUB1: /* Subnegotiation */ - case TS_SUB2: /* Subnegotiation */ - if (subneg(c)) - G.telstate = TS_0; - break; - } - } - if (G.telstate) - { - if (G.iaclen) iacflush(); - if (G.telstate == TS_0) G.telstate = 0; + switch (G.telstate) { + case TS_0: + if (c == IAC) + G.telstate = TS_IAC; + else + G.buf[cstart++] = c; + break; + case TS_IAC: + if (c == IAC) { /* IAC IAC -> 0xFF */ + G.buf[cstart++] = c; + G.telstate = TS_0; + break; + } + /* else */ + switch (c) { + case SB: + G.telstate = TS_SUB1; + break; + case DO: + case DONT: + case WILL: + case WONT: + G.telwish = c; + G.telstate = TS_OPT; + break; + default: + G.telstate = TS_0; /* DATA MARK must be added later */ + } + break; + case TS_OPT: /* WILL, WONT, DO, DONT */ + telopt(c); + G.telstate = TS_0; + break; + case TS_SUB1: /* Subnegotiation */ + case TS_SUB2: /* Subnegotiation */ + if (subneg(c)) + G.telstate = TS_0; + break; + } + } + if (G.telstate) { + if (G.iaclen) + iac_flush(); + if (G.telstate == TS_0) + G.telstate = 0; len = cstart; } if (len) - write(1, G.buf, len); + write(STDOUT_FILENO, G.buf, len); } - -/* ******************************* */ - -static inline void putiac(int c) +static void put_iac(int c) { G.iacbuf[G.iaclen++] = c; } - -static void putiac2(byte wwdd, byte c) +static void put_iac2(byte wwdd, byte c) { if (G.iaclen + 3 > IACBUFSIZE) - iacflush(); + iac_flush(); - putiac(IAC); - putiac(wwdd); - putiac(c); + put_iac(IAC); + put_iac(wwdd); + put_iac(c); } -#if 0 -static void putiac1(byte c) +#if ENABLE_FEATURE_TELNET_TTYPE +static void put_iac_subopt(byte c, char *str) { - if (G.iaclen + 2 > IACBUFSIZE) - iacflush(); + int len = strlen(str) + 6; // ( 2 + 1 + 1 + strlen + 2 ) + + if (G.iaclen + len > IACBUFSIZE) + iac_flush(); + + put_iac(IAC); + put_iac(SB); + put_iac(c); + put_iac(0); - putiac(IAC); - putiac(c); + while (*str) + put_iac(*str++); + + put_iac(IAC); + put_iac(SE); } #endif -#ifdef CONFIG_FEATURE_TELNET_TTYPE -static void putiac_subopt(byte c, char *str) +#if ENABLE_FEATURE_TELNET_AUTOLOGIN +static void put_iac_subopt_autologin(void) { - int len = strlen(str) + 6; // ( 2 + 1 + 1 + strlen + 2 ) + int len = strlen(G.autologin) + 6; // (2 + 1 + 1 + strlen + 2) + const char *user = "USER"; if (G.iaclen + len > IACBUFSIZE) - iacflush(); + iac_flush(); + + put_iac(IAC); + put_iac(SB); + put_iac(TELOPT_NEW_ENVIRON); + put_iac(TELQUAL_IS); + put_iac(NEW_ENV_VAR); - putiac(IAC); - putiac(SB); - putiac(c); - putiac(0); + while (*user) + put_iac(*user++); - while(*str) - putiac(*str++); + put_iac(NEW_ENV_VALUE); - putiac(IAC); - putiac(SE); + while (*G.autologin) + put_iac(*G.autologin++); + + put_iac(IAC); + put_iac(SE); } #endif -#ifdef CONFIG_FEATURE_AUTOWIDTH -static void putiac_naws(byte c, int x, int y) +#if ENABLE_FEATURE_AUTOWIDTH +static void put_iac_naws(byte c, int x, int y) { if (G.iaclen + 9 > IACBUFSIZE) - iacflush(); + iac_flush(); - putiac(IAC); - putiac(SB); - putiac(c); + put_iac(IAC); + put_iac(SB); + put_iac(c); - putiac((x >> 8) & 0xff); - putiac(x & 0xff); - putiac((y >> 8) & 0xff); - putiac(y & 0xff); + put_iac((x >> 8) & 0xff); + put_iac(x & 0xff); + put_iac((y >> 8) & 0xff); + put_iac(y & 0xff); - putiac(IAC); - putiac(SE); + put_iac(IAC); + put_iac(SE); } #endif -/* void putiacstring (subneg strings) */ - -/* ******************************* */ - -static char const escapecharis[] = "\r\nEscape character is "; +static char const escapecharis[] ALIGN1 = "\r\nEscape character is "; static void setConMode(void) { - if (G.telflags & UF_ECHO) - { + if (G.telflags & UF_ECHO) { if (G.charmode == CHM_TRY) { G.charmode = CHM_ON; printf("\r\nEntering character mode%s'^]'.\r\n", escapecharis); rawmode(); } - } - else - { + } else { if (G.charmode != CHM_OFF) { G.charmode = CHM_OFF; printf("\r\nEntering line mode%s'^C'.\r\n", escapecharis); @@ -405,17 +363,15 @@ static void setConMode(void) } } -/* ******************************* */ - static void will_charmode(void) { G.charmode = CHM_TRY; G.telflags |= (UF_ECHO | UF_SGA); setConMode(); - - putiac2(DO, TELOPT_ECHO); - putiac2(DO, TELOPT_SGA); - iacflush(); + + put_iac2(DO, TELOPT_ECHO); + put_iac2(DO, TELOPT_SGA); + iac_flush(); } static void do_linemode(void) @@ -424,125 +380,139 @@ static void do_linemode(void) G.telflags &= ~(UF_ECHO | UF_SGA); setConMode(); - putiac2(DONT, TELOPT_ECHO); - putiac2(DONT, TELOPT_SGA); - iacflush(); + put_iac2(DONT, TELOPT_ECHO); + put_iac2(DONT, TELOPT_SGA); + iac_flush(); } -/* ******************************* */ - -static inline void to_notsup(char c) +static void to_notsup(char c) { - if (G.telwish == WILL) putiac2(DONT, c); - else if (G.telwish == DO) putiac2(WONT, c); + if (G.telwish == WILL) + put_iac2(DONT, c); + else if (G.telwish == DO) + put_iac2(WONT, c); } -static inline void to_echo(void) +static void to_echo(void) { /* if server requests ECHO, don't agree */ - if (G.telwish == DO) { putiac2(WONT, TELOPT_ECHO); return; } - else if (G.telwish == DONT) return; - - if (G.telflags & UF_ECHO) - { - if (G.telwish == WILL) - return; + if (G.telwish == DO) { + put_iac2(WONT, TELOPT_ECHO); + return; } - else - if (G.telwish == WONT) + if (G.telwish == DONT) + return; + + if (G.telflags & UF_ECHO) { + if (G.telwish == WILL) return; + } else if (G.telwish == WONT) + return; if (G.charmode != CHM_OFF) G.telflags ^= UF_ECHO; if (G.telflags & UF_ECHO) - putiac2(DO, TELOPT_ECHO); + put_iac2(DO, TELOPT_ECHO); else - putiac2(DONT, TELOPT_ECHO); + put_iac2(DONT, TELOPT_ECHO); setConMode(); - WriteCS(1, "\r\n"); /* sudden modec */ + write_str(1, "\r\n"); /* sudden modec */ } -static inline void to_sga(void) +static void to_sga(void) { /* daemon always sends will/wont, client do/dont */ - if (G.telflags & UF_SGA) - { + if (G.telflags & UF_SGA) { if (G.telwish == WILL) return; - } - else - if (G.telwish == WONT) - return; - - if ((G.telflags ^= UF_SGA) & UF_SGA) /* toggle */ - putiac2(DO, TELOPT_SGA); - else - putiac2(DONT, TELOPT_SGA); + } else if (G.telwish == WONT) + return; - return; + G.telflags ^= UF_SGA; /* toggle */ + if (G.telflags & UF_SGA) + put_iac2(DO, TELOPT_SGA); + else + put_iac2(DONT, TELOPT_SGA); } -#ifdef CONFIG_FEATURE_TELNET_TTYPE -static inline void to_ttype(void) +#if ENABLE_FEATURE_TELNET_TTYPE +static void to_ttype(void) { /* Tell server we will (or won't) do TTYPE */ - if(ttype) - putiac2(WILL, TELOPT_TTYPE); + if (G.ttype) + put_iac2(WILL, TELOPT_TTYPE); else - putiac2(WONT, TELOPT_TTYPE); + put_iac2(WONT, TELOPT_TTYPE); +} +#endif - return; +#if ENABLE_FEATURE_TELNET_AUTOLOGIN +static void to_new_environ(void) +{ + /* Tell server we will (or will not) do AUTOLOGIN */ + + if (G.autologin) + put_iac2(WILL, TELOPT_NEW_ENVIRON); + else + put_iac2(WONT, TELOPT_NEW_ENVIRON); } #endif -#ifdef CONFIG_FEATURE_AUTOWIDTH -static inline void to_naws(void) -{ +#if ENABLE_FEATURE_AUTOWIDTH +static void to_naws(void) +{ /* Tell server we will do NAWS */ - putiac2(WILL, TELOPT_NAWS); - return; -} + put_iac2(WILL, TELOPT_NAWS); +} #endif static void telopt(byte c) { - switch (c) - { - case TELOPT_ECHO: to_echo(); break; - case TELOPT_SGA: to_sga(); break; -#ifdef CONFIG_FEATURE_TELNET_TTYPE - case TELOPT_TTYPE: to_ttype();break; + switch (c) { + case TELOPT_ECHO: + to_echo(); break; + case TELOPT_SGA: + to_sga(); break; +#if ENABLE_FEATURE_TELNET_TTYPE + case TELOPT_TTYPE: + to_ttype(); break; +#endif +#if ENABLE_FEATURE_TELNET_AUTOLOGIN + case TELOPT_NEW_ENVIRON: + to_new_environ(); break; #endif -#ifdef CONFIG_FEATURE_AUTOWIDTH - case TELOPT_NAWS: to_naws(); - putiac_naws(c, win_width, win_height); - break; +#if ENABLE_FEATURE_AUTOWIDTH + case TELOPT_NAWS: + to_naws(); + put_iac_naws(c, G.win_width, G.win_height); + break; #endif - default: to_notsup(c); - break; + default: + to_notsup(c); + break; } } - -/* ******************************* */ - /* subnegotiation -- ignore all (except TTYPE,NAWS) */ - static int subneg(byte c) { - switch (G.telstate) - { + switch (G.telstate) { case TS_SUB1: if (c == IAC) G.telstate = TS_SUB2; -#ifdef CONFIG_FEATURE_TELNET_TTYPE +#if ENABLE_FEATURE_TELNET_TTYPE else if (c == TELOPT_TTYPE) - putiac_subopt(TELOPT_TTYPE,ttype); + put_iac_subopt(TELOPT_TTYPE, G.ttype); +#endif +#if ENABLE_FEATURE_TELNET_AUTOLOGIN + else + if (c == TELOPT_NEW_ENVIRON) + put_iac_subopt_autologin(); #endif break; case TS_SUB2: @@ -554,93 +524,95 @@ static int subneg(byte c) return FALSE; } -/* ******************************* */ - -static void fgotsig(int sig) -{ - G.gotsig = sig; -} - - static void rawmode(void) { - tcsetattr(0, TCSADRAIN, &G.termios_raw); -} + if (G.do_termios) + tcsetattr(0, TCSADRAIN, &G.termios_raw); +} static void cookmode(void) { - tcsetattr(0, TCSADRAIN, &G.termios_def); + if (G.do_termios) + tcsetattr(0, TCSADRAIN, &G.termios_def); } -extern int telnet_main(int argc, char** argv) +/* poll gives smaller (-70 bytes) code */ +#define USE_POLL 1 + +int telnet_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int telnet_main(int argc UNUSED_PARAM, char **argv) { char *host; - char *port; + int port; int len; #ifdef USE_POLL struct pollfd ufds[2]; -#else +#else fd_set readfds; int maxfd; -#endif - -#ifdef CONFIG_FEATURE_AUTOWIDTH - struct winsize winp; - if( ioctl(0, TIOCGWINSZ, &winp) == 0 ) { - win_width = winp.ws_col; - win_height = winp.ws_row; - } #endif -#ifdef CONFIG_FEATURE_TELNET_TTYPE - ttype = getenv("TERM"); + INIT_G(); + +#if ENABLE_FEATURE_AUTOWIDTH + get_terminal_width_height(0, &G.win_width, &G.win_height); +#endif + +#if ENABLE_FEATURE_TELNET_TTYPE + G.ttype = getenv("TERM"); #endif - memset(&G, 0, sizeof G); + if (tcgetattr(0, &G.termios_def) >= 0) { + G.do_termios = 1; + G.termios_raw = G.termios_def; + cfmakeraw(&G.termios_raw); + } + +#if ENABLE_FEATURE_TELNET_AUTOLOGIN + if (1 & getopt32(argv, "al:", &G.autologin)) + G.autologin = getenv("USER"); + argv += optind; +#else + argv++; +#endif + if (!*argv) + bb_show_usage(); + host = *argv++; + port = bb_lookup_port(*argv ? *argv++ : "telnet", "tcp", 23); + if (*argv) /* extra params?? */ + bb_show_usage(); - if (tcgetattr(0, &G.termios_def) < 0) - exit(1); - - G.termios_raw = G.termios_def; - cfmakeraw(&G.termios_raw); - - if (argc < 2) bb_show_usage(); - port = (argc > 2)? argv[2] : "23"; - - host = argv[1]; - - G.netfd = xconnect(host, port); + xmove_fd(create_and_connect_stream_or_die(host, port), netfd); - setsockopt(G.netfd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof one); + setsockopt(netfd, SOL_SOCKET, SO_KEEPALIVE, &const_int_1, sizeof(const_int_1)); - signal(SIGINT, fgotsig); + signal(SIGINT, record_signo); #ifdef USE_POLL - ufds[0].fd = 0; ufds[1].fd = G.netfd; + ufds[0].fd = 0; ufds[1].fd = netfd; ufds[0].events = ufds[1].events = POLLIN; -#else +#else FD_ZERO(&readfds); - FD_SET(0, &readfds); - FD_SET(G.netfd, &readfds); - maxfd = G.netfd + 1; + FD_SET(STDIN_FILENO, &readfds); + FD_SET(netfd, &readfds); + maxfd = netfd + 1; #endif - - while (1) - { + + while (1) { #ifndef USE_POLL fd_set rfds = readfds; - + switch (select(maxfd, &rfds, NULL, NULL, NULL)) #else switch (poll(ufds, 2, -1)) -#endif +#endif { case 0: /* timeout */ case -1: /* error, ignore and/or log something, bay go to loop */ - if (G.gotsig) - conescape(); + if (bb_got_signal) + con_escape(); else sleep(1); break; @@ -648,45 +620,31 @@ extern int telnet_main(int argc, char** argv) #ifdef USE_POLL if (ufds[0].revents) /* well, should check POLLIN, but ... */ -#else - if (FD_ISSET(0, &rfds)) -#endif +#else + if (FD_ISSET(STDIN_FILENO, &rfds)) +#endif { - len = read(0, G.buf, DATABUFSIZE); - + len = read(STDIN_FILENO, G.buf, DATABUFSIZE); if (len <= 0) - doexit(0); - + doexit(EXIT_SUCCESS); TRACE(0, ("Read con: %d\n", len)); - - handlenetoutput(len); + handle_net_output(len); } #ifdef USE_POLL if (ufds[1].revents) /* well, should check POLLIN, but ... */ -#else - if (FD_ISSET(G.netfd, &rfds)) -#endif +#else + if (FD_ISSET(netfd, &rfds)) +#endif { - len = read(G.netfd, G.buf, DATABUFSIZE); - - if (len <= 0) - { - WriteCS(1, "Connection closed by foreign host.\r\n"); - doexit(1); + len = read(netfd, G.buf, DATABUFSIZE); + if (len <= 0) { + write_str(1, "Connection closed by foreign host\r\n"); + doexit(EXIT_FAILURE); } - TRACE(0, ("Read netfd (%d): %d\n", G.netfd, len)); - - handlenetinput(len); + TRACE(0, ("Read netfd (%d): %d\n", netfd, len)); + handle_net_input(len); } } - } + } /* while (1) */ } - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ |