0.0.1 6K It works.
0.0.2 5K Smaller and you can also check the exit condition if you wish.
- 0.0.3 Uses select()
+ 0.0.3 Uses select()
19980918 Busy Boxed! Dave Cinege
19990512 Uses Select. Charles P. Wright
19990513 Fixes stdin stupidity and uses buffers. Charles P. Wright
- 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 GPLv2 or later, see file LICENSE in this tarball for details.
*/
#include <stdio.h>
#include <sys/ioctl.h>
#include "busybox.h"
-#define GAPING_SECURITY_HOLE
-
static void timeout(int signum)
{
bb_error_msg_and_die("Timed out");
int nc_main(int argc, char **argv)
{
int do_listen = 0, lport = 0, delay = 0, wsecs = 0, tmpfd, opt, sfd, x;
- char buf[BUFSIZ];
-#ifdef GAPING_SECURITY_HOLE
- char * pr00gie = NULL;
+
+#define buf bb_common_bufsiz1
+
+#ifdef CONFIG_NC_GAPING_SECURITY_HOLE
+ char *pr00gie = NULL;
#endif
struct sockaddr_in address;
case 'i':
delay = atoi(optarg);
break;
-#ifdef GAPING_SECURITY_HOLE
+#ifdef CONFIG_NC_GAPING_SECURITY_HOLE
case 'e':
pr00gie = optarg;
break;
}
}
-#ifdef GAPING_SECURITY_HOLE
- if (pr00gie) {
- /* won't need stdin */
- close (STDIN_FILENO);
- }
-#endif /* GAPING_SECURITY_HOLE */
-
-
if ((do_listen && optind != argc) || (!do_listen && optind + 2 != argc))
bb_show_usage();
- if ((sfd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
- bb_perror_msg_and_die("socket");
+ sfd = bb_xsocket(AF_INET, SOCK_STREAM, 0);
x = 1;
- if (setsockopt (sfd, SOL_SOCKET, SO_REUSEADDR, &x, sizeof (x)) == -1)
- bb_perror_msg_and_die ("reuseaddr failed");
+ if (setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &x, sizeof (x)) == -1)
+ bb_perror_msg_and_die("reuseaddr");
address.sin_family = AF_INET;
if (wsecs) {
memset(&address.sin_addr, 0, sizeof(address.sin_addr));
address.sin_port = lport;
- if (bind(sfd, (struct sockaddr *) &address, sizeof(address)) < 0)
- bb_perror_msg_and_die("bind");
+ bb_xbind(sfd, (struct sockaddr *) &address, sizeof(address));
}
if (do_listen) {
socklen_t addrlen = sizeof(address);
- if (listen(sfd, 1) < 0)
- bb_perror_msg_and_die("listen");
-
+ bb_xlisten(sfd, 1);
if ((tmpfd = accept(sfd, (struct sockaddr *) &address, &addrlen)) < 0)
bb_perror_msg_and_die("accept");
signal(SIGALRM, SIG_DFL);
}
-#ifdef GAPING_SECURITY_HOLE
+#ifdef CONFIG_NC_GAPING_SECURITY_HOLE
/* -e given? */
if (pr00gie) {
dup2(sfd, 0);
close(sfd);
- dup2 (0, 1);
- dup2 (0, 2);
- execl (pr00gie, pr00gie, NULL);
+ dup2(0, 1);
+ dup2(0, 2);
+ execl(pr00gie, pr00gie, NULL);
/* Don't print stuff or it will go over the wire.... */
_exit(-1);
}
-#endif /* GAPING_SECURITY_HOLE */
-
+#endif /* CONFIG_NC_GAPING_SECURITY_HOLE */
FD_ZERO(&readfds);
FD_SET(sfd, &readfds);
for (fd = 0; fd < FD_SETSIZE; fd++) {
if (FD_ISSET(fd, &testfds)) {
if ((nread = safe_read(fd, buf, sizeof(buf))) < 0)
- bb_perror_msg_and_die("read");
+ bb_perror_msg_and_die(bb_msg_read_error);
if (fd == sfd) {
if (nread == 0)
exit(0);
ofd = STDOUT_FILENO;
} else {
- if (nread == 0)
- shutdown(sfd, 1);
+ if (nread <= 0) {
+ shutdown(sfd, 1 /* send */ );
+ close(STDIN_FILENO);
+ FD_CLR(STDIN_FILENO, &readfds);
+ }
ofd = sfd;
}
if (bb_full_write(ofd, buf, nread) < 0)
- bb_perror_msg_and_die("write");
+ bb_perror_msg_and_die(bb_msg_write_error);
if (delay > 0) {
sleep(delay);
}