X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fnc_bloaty.c;h=b28d05f515c8b7d2270c33d07b8b996ffcdd4e1d;hb=2db782bc7be70c34a756e2bc6d4a53e8f47bab20;hp=00ba6f114657cf7660132fb670b4b53637e61aab;hpb=de6f14800675cd0401106876da81da7618de71c6;p=oweals%2Fbusybox.git diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c index 00ba6f114..b28d05f51 100644 --- a/networking/nc_bloaty.c +++ b/networking/nc_bloaty.c @@ -48,6 +48,12 @@ * - TCP connects from wrong ip/ports (if peer ip:port is specified * on the command line, but accept() says that it came from different addr) * are closed, but we don't exit - we continue to listen/accept. + * Since bbox 1.22: + * - nc exits when _both_ stdin and network are closed. + * This makes these two commands: + * echo "Yes" | nc 127.0.0.1 1234 + * echo "no" | nc -lp 1234 + * exchange their data _and exit_ instead of being stuck. */ /* done in nc.c: #include "libbb.h" */ @@ -134,8 +140,6 @@ struct globals { jmp_buf jbuf; /* timer crud */ - fd_set ding1; /* for select loop */ - fd_set ding2; char bigbuf_in[BIGSIZ]; /* data buffers */ char bigbuf_net[BIGSIZ]; }; @@ -147,8 +151,6 @@ struct globals { #define themaddr (G.themaddr ) #define remend (G.remend ) #define jbuf (G.jbuf ) -#define ding1 (G.ding1 ) -#define ding2 (G.ding2 ) #define bigbuf_in (G.bigbuf_in ) #define bigbuf_net (G.bigbuf_net) #define o_verbose (G.o_verbose ) @@ -173,9 +175,9 @@ enum { OPT_w = (1 << 5), OPT_l = (1 << 6) * ENABLE_NC_SERVER, OPT_k = (1 << 7) * ENABLE_NC_SERVER, - OPT_i = (1 << (7+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA, - OPT_o = (1 << (8+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA, - OPT_z = (1 << (9+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA, + OPT_i = (1 << (6+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA, + OPT_o = (1 << (7+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA, + OPT_z = (1 << (8+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA, }; #define o_nflag (option_mask32 & OPT_n) @@ -590,26 +592,27 @@ static int readwrite(void) unsigned rzleft; unsigned rnleft; unsigned netretry; /* net-read retry counter */ - unsigned wretry; /* net-write sanity counter */ - unsigned wfirst; /* one-shot flag to skip first net read */ + unsigned fds_open; /* if you don't have all this FD_* macro hair in sys/types.h, you'll have to either find it or do your own bit-bashing: *ding1 |= (1 << fd), etc... */ - FD_SET(netfd, &ding1); /* global: the net is open */ + fd_set ding1; /* for select loop */ + fd_set ding2; + FD_ZERO(&ding1); + FD_SET(netfd, &ding1); + FD_SET(STDIN_FILENO, &ding1); + fds_open = 2; + netretry = 2; - wfirst = 0; rzleft = rnleft = 0; if (o_interval) sleep(o_interval); /* pause *before* sending stuff, too */ - errno = 0; /* clear from sleep, close, whatever */ /* and now the big ol' select shoveling loop ... */ - while (FD_ISSET(netfd, &ding1)) { /* i.e. till the *net* closes! */ - wretry = 8200; /* more than we'll ever hafta write */ - if (wfirst) { /* any saved stdin buffer? */ - wfirst = 0; /* clear flag for the duration */ - goto shovel; /* and go handle it first */ - } + /* nc 1.10 has "while (FD_ISSET(netfd)" here */ + while (fds_open) { + unsigned wretry = 8200; /* net-write sanity counter */ + ding2 = ding1; /* FD_COPY ain't portable... */ /* some systems, notably linux, crap into their select timers on return, so we create a expendable copy and give *that* to select. */ @@ -629,13 +632,14 @@ static int readwrite(void) /* if we have a timeout AND stdin is closed AND we haven't heard anything from the net during that time, assume it's dead and close it too. */ if (rr == 0) { - if (!FD_ISSET(STDIN_FILENO, &ding1)) + if (!FD_ISSET(STDIN_FILENO, &ding1)) { netretry--; /* we actually try a coupla times. */ - if (!netretry) { - if (o_verbose > 1) /* normally we don't care */ - fprintf(stderr, "net timeout\n"); - close(netfd); - return 0; /* not an error! */ + if (!netretry) { + if (o_verbose > 1) /* normally we don't care */ + fprintf(stderr, "net timeout\n"); + /*close(netfd); - redundant, exit will do it */ + return 0; /* not an error! */ + } } } /* select timeout */ /* xxx: should we check the exception fds too? The read fds seem to give @@ -649,7 +653,8 @@ static int readwrite(void) /* nc 1.10 doesn't do this */ bb_perror_msg("net read"); } - FD_CLR(netfd, &ding1); /* net closed, we'll finish up... */ + FD_CLR(netfd, &ding1); /* net closed */ + fds_open--; rzleft = 0; /* can't write anymore: broken pipe */ } else { rnleft = rr; @@ -669,11 +674,12 @@ Debug("got %d from the net, errno %d", rr, errno); /* Considered making reads here smaller for UDP mode, but 8192-byte mobygrams are kinda fun and exercise the reassembler. */ if (rr <= 0) { /* at end, or fukt, or ... */ - FD_CLR(STDIN_FILENO, &ding1); /* disable and close stdin */ - close(STDIN_FILENO); -// Does it make sense to shutdown(net_fd, SHUT_WR) -// to let other side know that we won't write anything anymore? -// (and what about keeping compat if we do that?) + FD_CLR(STDIN_FILENO, &ding1); /* disable stdin */ + /*close(STDIN_FILENO); - not really necessary */ + /* Let peer know we have no more data */ + /* nc 1.10 doesn't do this: */ + shutdown(netfd, SHUT_WR); + fds_open--; } else { rzleft = rr; zp = bigbuf_in; @@ -684,24 +690,14 @@ Debug("got %d from the net, errno %d", rr, errno); Geez, why does this look an awful lot like the big loop in "rsh"? ... not sure if the order of this matters, but write net -> stdout first. */ - /* sanity check. Works because they're both unsigned... */ - if ((rzleft > 8200) || (rnleft > 8200)) { - holler_error("bogus buffers: %u, %u", rzleft, rnleft); - rzleft = rnleft = 0; - } - /* net write retries sometimes happen on UDP connections */ - if (!wretry) { /* is something hung? */ - holler_error("too many output retries"); - return 1; - } if (rnleft) { rr = write(STDOUT_FILENO, np, rnleft); if (rr > 0) { if (o_ofile) /* log the stdout */ oprint('<', (unsigned char *)np, rr); - np += rr; /* fix up ptrs and whatnot */ - rnleft -= rr; /* will get sanity-checked above */ - wrote_out += rr; /* global count */ + np += rr; + rnleft -= rr; + wrote_out += rr; /* global count */ } Debug("wrote %d to stdout, errno %d", rr, errno); } /* rnleft */ @@ -716,20 +712,24 @@ Debug("wrote %d to stdout, errno %d", rr, errno); oprint('>', (unsigned char *)zp, rr); zp += rr; rzleft -= rr; - wrote_net += rr; /* global count */ + wrote_net += rr; /* global count */ } Debug("wrote %d to net, errno %d", rr, errno); } /* rzleft */ if (o_interval) { /* cycle between slow lines, or ... */ sleep(o_interval); - errno = 0; /* clear from sleep */ continue; /* ...with hairy select loop... */ } - if ((rzleft) || (rnleft)) { /* shovel that shit till they ain't */ + if (rzleft || rnleft) { /* shovel that shit till they ain't */ wretry--; /* none left, and get another load */ + /* net write retries sometimes happen on UDP connections */ + if (!wretry) { /* is something hung? */ + holler_error("too many output retries"); + return 1; + } goto shovel; } - } /* while ding1:netfd is open */ + } /* while (fds_open) */ /* XXX: maybe want a more graceful shutdown() here, or screw around with linger times?? I suspect that I don't need to since I'm always doing @@ -876,9 +876,8 @@ int nc_main(int argc UNUSED_PARAM, char **argv) } #endif - FD_SET(STDIN_FILENO, &ding1); /* stdin *is* initially open */ if (proggie) { - close(0); /* won't need stdin */ + close(STDIN_FILENO); /* won't need stdin */ option_mask32 &= ~OPT_o; /* -o with -e is meaningless! */ } #if ENABLE_NC_EXTRA