* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
-#include "busybox.h"
+#include "libbb.h"
+
+#if ENABLE_DESKTOP
+#include "nc_bloaty.c"
+#else
+
+/* Lots of small differences in features
+ * when compared to "standard" nc
+ */
static void timeout(int signum)
{
bb_error_msg_and_die("timed out");
}
+int nc_main(int argc, char **argv);
int nc_main(int argc, char **argv)
{
- int sfd = 0;
+ /* 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_SERVER(const) unsigned lport = 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;)
- struct sockaddr_in address;
+ len_and_sockaddr *lsa;
fd_set readfds, testfds;
int opt; /* must be signed (getopt returns -1) */
- memset(&address, 0, sizeof(address));
-
if (ENABLE_NC_SERVER || ENABLE_NC_EXTRA) {
/* getopt32 is _almost_ usable:
** it cannot handle "... -e prog -prog-opt" */
"" 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') 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) {
+ else if (ENABLE_NC_SERVER && opt=='p') {
+ 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
// -l and -f don't mix
if (do_listen && cfd) bb_show_usage();
// Listen or file modes need zero arguments, client mode needs 2
- opt = ((do_listen || cfd) ? 0 : 2);
- if (argc != opt)
- bb_show_usage();
+ 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--;
}
if (!cfd) {
- sfd = xsocket(AF_INET, SOCK_STREAM, 0);
- fcntl(sfd, F_SETFD, FD_CLOEXEC);
- setsockopt_reuseaddr(sfd);
- address.sin_family = AF_INET;
-
- // Set local port.
-
- if (lport != 0) {
- address.sin_port = lport;
- xbind(sfd, (struct sockaddr *) &address, sizeof(address));
- }
-
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->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, (struct sockaddr *) &address, &len);
- fdprintf(2, "%d\n", SWAP_BE16(address.sin_port));
+ socklen_t addrlen = lsa->len;
+ getsockname(sfd, &lsa->sa, &addrlen);
+ lport = get_nport(&lsa->sa);
+ fdprintf(2, "%d\n", ntohs(lport));
}
- repeatyness:
- cfd = accept(sfd, (struct sockaddr *) &address, &addrlen);
+ fcntl(sfd, F_SETFD, FD_CLOEXEC);
+ accept_again:
+ cfd = accept(sfd, NULL, 0);
if (cfd < 0)
bb_perror_msg_and_die("accept");
-
- if (!execparam) close(sfd);
+ if (!execparam)
+ close(sfd);
} else {
- struct hostent *hostinfo;
- hostinfo = xgethostbyname(argv[0]);
-
- address.sin_addr = *(struct in_addr *) *hostinfo->h_addr_list;
- address.sin_port = bb_lookup_port(argv[1], "tcp", 0);
-
- xconnect(sfd, (struct sockaddr *) &address, sizeof(address));
- cfd = sfd;
+ cfd = create_and_connect_stream_or_die(argv[0],
+ argv[1] ? bb_lookup_port(argv[1], "tcp", 0) : 0);
}
}
/* -e given? */
if (execparam) {
- if (cfd) {
- signal(SIGCHLD, SIG_IGN);
- dup2(cfd, 0);
- close(cfd);
- }
- dup2(0, 1);
- dup2(0, 2);
-
+ signal(SIGCHLD, SIG_IGN);
// With more than one -l, repeatedly act as server.
-
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.
close(0);
close(1);
close(2);
-
- goto repeatyness;
+ goto accept_again;
}
- USE_NC_EXTRA(execvp(execparam[0], execparam);)
+ /* 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);
}
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) {
}
ofd = cfd;
}
-
- xwrite(ofd, bb_common_bufsiz1, nread);
+ xwrite(ofd, iobuf, nread);
if (delay > 0) sleep(delay);
}
}
}
}
+#endif
projects / oweals / busybox.git / blobdiff