X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=networking%2Fnc.c;h=7d4a6e047f129afbb419de6a1e2dd409f8fd5cc3;hb=fcc6347976ded376c9effe3b9fb216b00b2140cb;hp=3f4149e14289bfdb866408cf534b09b151f23bcc;hpb=d921b2ecc0d294ad4bf8c7458fc52a60c28727d2;p=oweals%2Fbusybox.git diff --git a/networking/nc.c b/networking/nc.c index 3f4149e14..7d4a6e047 100644 --- a/networking/nc.c +++ b/networking/nc.c @@ -1,101 +1,131 @@ /* vi: set sw=4 ts=4: */ /* nc: mini-netcat - built from the ground up for LRP - * + * * Copyright (C) 1998, 1999 Charles P. Wright * Copyright (C) 1998 Dave Cinege - * + * * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include "busybox.h" +#include "libbb.h" -static void timeout(int signum) +#if ENABLE_DESKTOP +#include "nc_bloaty.c" +#else + +/* Lots of small differences in features + * when compared to "standard" nc + */ + +static void timeout(int signum ATTRIBUTE_UNUSED) { - bb_error_msg_and_die("Timed out"); + bb_error_msg_and_die("timed out"); } +int nc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int nc_main(int argc, char **argv) { - int do_listen = 0, lport = 0, delay = 0, wsecs = 0, execflag = 0, opt, - sfd = 0, cfd; - struct sockaddr_in address; - struct hostent *hostinfo; + /* sfd sits _here_ only because of "repeat" option (-l -l). */ + int sfd = sfd; /* for gcc */ + int cfd = 0; + unsigned lport = 0; + SKIP_NC_SERVER(const) unsigned do_listen = 0; + SKIP_NC_EXTRA (const) unsigned wsecs = 0; + SKIP_NC_EXTRA (const) unsigned delay = 0; + SKIP_NC_EXTRA (const int execparam = 0;) + USE_NC_EXTRA (char **execparam = NULL;) + len_and_sockaddr *lsa; fd_set readfds, testfds; - char *infile = NULL; - - memset(&address, 0, sizeof(address)); - - if (ENABLE_NC_SERVER || ENABLE_NC_EXTRA) { - while ((opt = getopt(argc, argv, "lp:" USE_NC_EXTRA("i:ew:f:"))) > 0) { - if (ENABLE_NC_SERVER && opt=='l') do_listen++; + int opt; /* must be signed (getopt returns -1) */ + + if (ENABLE_NC_SERVER || ENABLE_NC_EXTRA) { + /* getopt32 is _almost_ usable: + ** it cannot handle "... -e prog -prog-opt" */ + while ((opt = getopt(argc, argv, + "" USE_NC_SERVER("lp:") USE_NC_EXTRA("w:i:f:e:") )) > 0 + ) { + if (ENABLE_NC_SERVER && opt=='l') + USE_NC_SERVER(do_listen++); else if (ENABLE_NC_SERVER && opt=='p') - lport = bb_lookup_port(optarg, "tcp", 0); - else if (ENABLE_NC_EXTRA && opt=='w') wsecs = atoi(optarg); - else if (ENABLE_NC_EXTRA && opt=='i') delay = atoi(optarg); - else if (ENABLE_NC_EXTRA && opt=='f') infile = optarg; - else if (ENABLE_NC_EXTRA && opt=='e' && optind!=argc) { - execflag++; - break; + USE_NC_SERVER(lport = bb_lookup_port(optarg, "tcp", 0)); + else if (ENABLE_NC_EXTRA && opt=='w') + USE_NC_EXTRA( wsecs = xatou(optarg)); + else if (ENABLE_NC_EXTRA && opt=='i') + USE_NC_EXTRA( delay = xatou(optarg)); + else if (ENABLE_NC_EXTRA && opt=='f') + USE_NC_EXTRA( cfd = xopen(optarg, O_RDWR)); + else if (ENABLE_NC_EXTRA && opt=='e' && optind <= argc) { + /* We cannot just 'break'. We should let getopt finish. + ** Or else we won't be able to find where + ** 'host' and 'port' params are + ** (think "nc -w 60 host port -e prog"). */ + USE_NC_EXTRA( + char **p; + // +2: one for progname (optarg) and one for NULL + execparam = xzalloc(sizeof(char*) * (argc - optind + 2)); + p = execparam; + *p++ = optarg; + while (optind < argc) { + *p++ = argv[optind++]; + } + ) + /* optind points to argv[arvc] (NULL) now. + ** FIXME: we assume that getopt will not count options + ** possibly present on "-e prog args" and will not + ** include them into final value of optind + ** which is to be used ... */ } else bb_show_usage(); } + argv += optind; /* ... here! */ + argc -= optind; + // -l and -f don't mix + if (do_listen && cfd) bb_show_usage(); + // Listen or file modes need zero arguments, client mode needs 2 + if (do_listen || cfd) { + if (argc) bb_show_usage(); + } else { + if (!argc || argc > 2) bb_show_usage(); + } + } else { + if (argc != 3) bb_show_usage(); + argc--; + argv++; } - - // For listen or file we need zero arguments, dialout is 2. - // For exec we need at least one more argument at the end, more ok - - opt = (do_listen || infile) ? 0 : 2 + execflag; - if (execflag ? argc-optind < opt : argc-optind!=opt || - (infile && do_listen)) - bb_show_usage(); - if (wsecs) { signal(SIGALRM, timeout); alarm(wsecs); } - - if (infile) cfd = xopen(infile, O_RDWR); - else { - opt = 1; - sfd = xsocket(AF_INET, SOCK_STREAM, 0); - fcntl(sfd, F_SETFD, FD_CLOEXEC); - setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof (opt)); - address.sin_family = AF_INET; - - // Set local port. - - if (lport != 0) { - address.sin_port = lport; - - xbind(sfd, (struct sockaddr *) &address, sizeof(address)); - } + if (!cfd) { if (do_listen) { - socklen_t addrlen = sizeof(address); - - xlisten(sfd, do_listen); - - // If we didn't specify a port number, query and print it to stderr. - + /* create_and_bind_stream_or_die(NULL, lport) + * would've work wonderfully, but we need + * to know lsa */ + sfd = xsocket_stream(&lsa); + if (lport) + set_nport(lsa, htons(lport)); + setsockopt_reuseaddr(sfd); + xbind(sfd, &lsa->u.sa, lsa->len); + xlisten(sfd, do_listen); /* can be > 1 */ + /* If we didn't specify a port number, + * query and print it after listen() */ if (!lport) { - socklen_t len = sizeof(address); - getsockname(sfd, &address, &len); - fdprintf(2, "%d\n", SWAP_BE16(address.sin_port)); + socklen_t addrlen = lsa->len; + getsockname(sfd, &lsa->u.sa, &addrlen); + lport = get_nport(&lsa->u.sa); + fdprintf(2, "%d\n", ntohs(lport)); } -repeatyness: - if ((cfd = accept(sfd, (struct sockaddr *) &address, &addrlen)) < 0) + close_on_exec_on(sfd); + accept_again: + cfd = accept(sfd, NULL, 0); + if (cfd < 0) bb_perror_msg_and_die("accept"); - - if (!execflag) close(sfd); + if (!execparam) + close(sfd); } else { - hostinfo = xgethostbyname(argv[optind]); - - address.sin_addr = *(struct in_addr *) *hostinfo->h_addr_list; - address.sin_port = bb_lookup_port(argv[optind+1], "tcp", 0); - - if (connect(sfd, (struct sockaddr *) &address, sizeof(address)) < 0) - bb_perror_msg_and_die("connect"); - cfd = sfd; + cfd = create_and_connect_stream_or_die(argv[0], + argv[1] ? bb_lookup_port(argv[1], "tcp", 0) : 0); } } @@ -105,34 +135,34 @@ repeatyness: } /* -e given? */ - if (execflag) { - if(cfd) { - signal(SIGCHLD, SIG_IGN); - dup2(cfd, 0); - close(cfd); - } - dup2(0, 1); - dup2(0, 2); - + if (execparam) { + signal(SIGCHLD, SIG_IGN); // With more than one -l, repeatedly act as server. - - if (do_listen>1 && vfork()) { + if (do_listen > 1 && vfork()) { + /* parent */ // This is a bit weird as cleanup goes, since we wind up with no // stdin/stdout/stderr. But it's small and shouldn't hurt anything. // We check for cfd == 0 above. + logmode = LOGMODE_NONE; close(0); close(1); close(2); - - goto repeatyness; + goto accept_again; } - execvp(argv[optind], argv+optind); + /* child (or main thread if no multiple -l) */ + if (cfd) { + dup2(cfd, 0); + close(cfd); + } + dup2(0, 1); + dup2(0, 2); + USE_NC_EXTRA(BB_EXECVP(execparam[0], execparam);) /* Don't print stuff or it will go over the wire.... */ _exit(127); } // Select loop copying stdin to cfd, and cfd to stdout. - + FD_ZERO(&readfds); FD_SET(cfd, &readfds); FD_SET(STDIN_FILENO, &readfds); @@ -147,13 +177,13 @@ repeatyness: if (select(FD_SETSIZE, &testfds, NULL, NULL, NULL) < 0) bb_perror_msg_and_die("select"); +#define iobuf bb_common_bufsiz1 for (fd = 0; fd < FD_SETSIZE; fd++) { if (FD_ISSET(fd, &testfds)) { - nread = safe_read(fd, bb_common_bufsiz1, - sizeof(bb_common_bufsiz1)); - + nread = safe_read(fd, iobuf, sizeof(iobuf)); if (fd == cfd) { - if (nread<1) exit(0); + if (nread < 1) + exit(0); ofd = STDOUT_FILENO; } else { if (nread<1) { @@ -164,10 +194,10 @@ repeatyness: } ofd = cfd; } - - xwrite(ofd, bb_common_bufsiz1, nread); + xwrite(ofd, iobuf, nread); if (delay > 0) sleep(delay); } } } } +#endif