* setuid()
*/
-#include "busybox.h"
+#include "libbb.h"
#include <syslog.h>
#include <sys/un.h>
-//#define CONFIG_FEATURE_INETD_RPC
-//#define CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO
-//#define CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
-//#define CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME
-//#define CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
-//#define CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
-//#define CONFIG_FEATURE_IPV6
+//#define ENABLE_FEATURE_INETD_RPC 1
+//#define ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_ECHO 1
+//#define ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD 1
+//#define ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_TIME 1
+//#define ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME 1
+//#define ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN 1
+//#define ENABLE_FEATURE_IPV6 1
-#ifdef CONFIG_FEATURE_INETD_RPC
+#if ENABLE_FEATURE_INETD_RPC
#include <rpc/rpc.h>
#include <rpc/pmap_clnt.h>
#endif
-#define _PATH_INETDCONF "/etc/inetd.conf"
-#define _PATH_INETDPID "/var/run/inetd.pid"
+extern char **environ;
+
+#define _PATH_INETDPID "/var/run/inetd.pid"
#define CNT_INTVL 60 /* servers in CNT_INTVL sec. */
#define RETRYTIME (60*10) /* retry after bind or server fail */
/* Check unsupporting builtin */
-#if defined CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO || \
- defined CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD || \
- defined CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME || \
- defined CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME || \
- defined CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_ECHO || \
+ ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD || \
+ ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_TIME || \
+ ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME || \
+ ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
# define INETD_FEATURE_ENABLED
#endif
-#if defined CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO || \
- defined CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD || \
- defined CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_ECHO || \
+ ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD || \
+ ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
# define INETD_SETPROCTITLE
#endif
int se_socktype; /* type of socket to use */
int se_family; /* address family */
char *se_proto; /* protocol used */
-#ifdef CONFIG_FEATURE_INETD_RPC
+#if ENABLE_FEATURE_INETD_RPC
int se_rpcprog; /* rpc program number */
int se_rpcversl; /* rpc program lowest version */
int se_rpcversh; /* rpc program highest version */
union {
struct sockaddr se_un_ctrladdr;
struct sockaddr_in se_un_ctrladdr_in;
-#ifdef CONFIG_FEATURE_IPV6
+#if ENABLE_FEATURE_IPV6
struct sockaddr_in6 se_un_ctrladdr_in6;
#endif
struct sockaddr_un se_un_ctrladdr_un;
};
/* Echo received data */
-#ifdef CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_ECHO
static void echo_stream(int, servtab_t *);
static void echo_dg(int, servtab_t *);
#endif
/* Internet /dev/null */
-#ifdef CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
static void discard_stream(int, servtab_t *);
static void discard_dg(int, servtab_t *);
#endif
/* Return 32 bit time since 1900 */
-#ifdef CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_TIME
static void machtime_stream(int, servtab_t *);
static void machtime_dg(int, servtab_t *);
#endif
/* Return human-readable time */
-#ifdef CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
static void daytime_stream(int, servtab_t *);
static void daytime_dg(int, servtab_t *);
#endif
/* Familiar character generator */
-#ifdef CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
static void chargen_stream(int, servtab_t *);
static void chargen_dg(int, servtab_t *);
#endif
static const struct builtin builtins[] = {
-#ifdef CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_ECHO
/* Echo received data */
{"echo", SOCK_STREAM, 1, 0, echo_stream,},
{"echo", SOCK_DGRAM, 0, 0, echo_dg,},
#endif
-#ifdef CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
/* Internet /dev/null */
{"discard", SOCK_STREAM, 1, 0, discard_stream,},
{"discard", SOCK_DGRAM, 0, 0, discard_dg,},
#endif
-#ifdef CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_TIME
/* Return 32 bit time since 1900 */
{"time", SOCK_STREAM, 0, 0, machtime_stream,},
{"time", SOCK_DGRAM, 0, 0, machtime_dg,},
#endif
-#ifdef CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
/* Return human-readable time */
{"daytime", SOCK_STREAM, 0, 0, daytime_stream,},
{"daytime", SOCK_DGRAM, 0, 0, daytime_dg,},
#endif
-#ifdef CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
/* Familiar character generator */
{"chargen", SOCK_STREAM, 1, 0, chargen_stream,},
{"chargen", SOCK_DGRAM, 0, 0, chargen_dg,},
static struct servent *sp;
static uid_t uid;
-static char *CONFIG = _PATH_INETDCONF;
+static const char *config_filename = "/etc/inetd.conf";
static FILE *fconfig;
-static char line[1024];
static char *defhost;
/* xstrdup(NULL) returns NULL, but this one
fseek(fconfig, 0L, SEEK_SET);
return 1;
}
- fconfig = fopen(CONFIG, "r");
+ fconfig = fopen(config_filename, "r");
return (fconfig != NULL);
}
defhost = 0;
}
-#ifdef CONFIG_FEATURE_INETD_RPC
+#if ENABLE_FEATURE_INETD_RPC
static void register_rpc(servtab_t *sep)
{
int n;
bb_error_msg("pmap_unset(%u, %u)", sep->se_rpcprog, n);
}
}
-#endif /* CONFIG_FEATURE_INETD_RPC */
+#endif /* FEATURE_INETD_RPC */
static void freeconfig(servtab_t *cp)
{
free(cp->se_argv[i]);
}
-static int bump_nofile (void)
+static int bump_nofile(void)
{
#define FD_CHUNK 32
struct rlimit rl;
- if (getrlimit (RLIMIT_NOFILE, &rl) < 0) {
+ if (getrlimit(RLIMIT_NOFILE, &rl) < 0) {
bb_perror_msg("getrlimit");
return -1;
}
if (setsockopt_reuseaddr(sep->se_fd) < 0)
bb_perror_msg("setsockopt(SO_REUSEADDR)");
-#ifdef CONFIG_FEATURE_INETD_RPC
+#if ENABLE_FEATURE_INETD_RPC
if (isrpcservice(sep)) {
struct passwd *pwd;
static char *nextline(void)
{
+#define line bb_common_bufsiz1
+
char *cp;
FILE *fd = fconfig;
return NULL;
}
-again:
+ again:
while (*cp == ' ' || *cp == '\t')
cp++;
if (*cp == '\0') {
int c;
c = getc(fconfig);
- (void) ungetc(c, fconfig);
- if (c == ' ' || c == '\t')
- if ((cp = nextline()))
+ ungetc(c, fconfig);
+ if (c == ' ' || c == '\t') {
+ cp = nextline();
+ if (cp)
goto again;
+ }
*cpp = NULL;
/* goto erp; */
return NULL;
newtab->se_socktype = sep->se_socktype;
newtab->se_family = sep->se_family;
newtab->se_proto = xstrdup(sep->se_proto);
-#ifdef CONFIG_FEATURE_INETD_RPC
+#if ENABLE_FEATURE_INETD_RPC
newtab->se_rpcprog = sep->se_rpcprog;
newtab->se_rpcversl = sep->se_rpcversl;
newtab->se_rpcversh = sep->se_rpcversh;
} else {
sep->se_family = AF_INET;
if (sep->se_proto[strlen(sep->se_proto) - 1] == '6')
-#ifdef CONFIG_FEATURE_IPV6
+#if ENABLE_FEATURE_IPV6
sep->se_family = AF_INET6;
#else
bb_error_msg("%s: IPV6 not supported", sep->se_proto);
#endif
if (strncmp(sep->se_proto, "rpc/", 4) == 0) {
-#ifdef CONFIG_FEATURE_INETD_RPC
+#if ENABLE_FEATURE_INETD_RPC
char *p, *ccp;
long l;
*p++ = '\0';
l = strtol(p, &ccp, 0);
if (ccp == p || l < 0 || l > INT_MAX) {
- badafterall:
+ badafterall:
bb_error_msg("%s/%s: bad rpc version", sep->se_service, p);
goto more;
}
}
}
/* XXX BUG?: is this skip: label supposed to remain? */
- skip:
+ skip:
nsep = nsep->se_next;
}
sep = new_servtab();
*sep = *cp;
sep->se_fd = -1;
-#ifdef CONFIG_FEATURE_INETD_RPC
+#if ENABLE_FEATURE_INETD_RPC
sep->se_rpcprog = -1;
#endif
Block_Using_Signals(omask);
sizeof(new->se_ctrladdr_in.sin_addr)) != 0)
return 0;
-#ifdef CONFIG_FEATURE_IPV6
+#if ENABLE_FEATURE_IPV6
if (old->se_family == AF_INET6 && new->se_family == AF_INET6 &&
memcmp(&old->se_ctrladdr_in6.sin6_addr,
&new->se_ctrladdr_in6.sin6_addr,
char protoname[10];
if (!setconfig()) {
- bb_perror_msg("%s", CONFIG);
+ bb_perror_msg("%s", config_filename);
return;
}
for (sep = servtab; sep; sep = sep->se_next)
SWAP(char *, sep->se_argv[i], cp->se_argv[i]);
#undef SWAP
-#ifdef CONFIG_FEATURE_INETD_RPC
+#if ENABLE_FEATURE_INETD_RPC
if (isrpcservice(sep))
unregister_rpc(sep);
sep->se_rpcversl = cp->se_rpcversl;
/* se_ctrladdr_in was set in getconfigent */
sep->se_ctrladdr_size = sizeof sep->se_ctrladdr_in;
-#ifdef CONFIG_FEATURE_INETD_RPC
+#if ENABLE_FEATURE_INETD_RPC
if (isrpcservice(sep)) {
struct rpcent *rp;
// FIXME: atoi_or_else(str, 0) would be handy here
setup(sep);
}
break;
-#ifdef CONFIG_FEATURE_IPV6
+#if ENABLE_FEATURE_IPV6
case AF_INET6:
sep->se_ctrladdr_in6.sin6_family = AF_INET6;
/* se_ctrladdr_in was set in getconfigent */
sep->se_ctrladdr_size = sizeof sep->se_ctrladdr_in6;
-#ifdef CONFIG_FEATURE_INETD_RPC
+#if ENABLE_FEATURE_INETD_RPC
if (isrpcservice(sep)) {
struct rpcent *rp;
setup(sep);
}
break;
-#endif /* CONFIG_FEATURE_IPV6 */
+#endif /* FEATURE_IPV6 */
}
- serv_unknown:
+ serv_unknown:
if (cp->se_next != NULL) {
servtab_t *tmp = cp;
nsock--;
(void) close(sep->se_fd);
}
-#ifdef CONFIG_FEATURE_INETD_RPC
+#if ENABLE_FEATURE_INETD_RPC
if (isrpcservice(sep))
unregister_rpc(sep);
#endif
switch (sep->se_family) {
case AF_UNIX:
case AF_INET:
-#ifdef CONFIG_FEATURE_IPV6
+#if ENABLE_FEATURE_IPV6
case AF_INET6:
#endif
setup(sep);
-#ifdef CONFIG_FEATURE_INETD_RPC
+#if ENABLE_FEATURE_INETD_RPC
if (sep->se_fd != -1 && isrpcservice(sep))
register_rpc(sep);
#endif
(void) unlink(sep->se_service);
break;
case AF_INET:
-#ifdef CONFIG_FEATURE_IPV6
+#if ENABLE_FEATURE_IPV6
case AF_INET6:
#endif
-#ifdef CONFIG_FEATURE_INETD_RPC
+#if ENABLE_FEATURE_INETD_RPC
if (sep->se_wait == 1 && isrpcservice(sep))
unregister_rpc(sep); /* XXX signal race */
#endif
}
(void) close(sep->se_fd);
}
- (void) unlink(_PATH_INETDPID);
+ remove_pidfile(_PATH_INETDPID);
exit(0);
}
#endif
-int
-inetd_main(int argc, char *argv[])
+int inetd_main(int argc, char **argv);
+int inetd_main(int argc, char **argv)
{
servtab_t *sep;
struct passwd *pwd;
sigset_t omask, wait_mask;
#ifdef INETD_SETPROCTITLE
- extern char **environ;
char **envp = environ;
Argv = argv;
LastArg = envp[-1] + strlen(envp[-1]);
#endif
- openlog(applet_name, LOG_PID | LOG_NOWAIT, LOG_DAEMON);
+ uid = getuid();
+ if (uid != 0)
+ config_filename = NULL;
opt = getopt32(argc, argv, "R:f", &stoomany);
- if(opt & 1) {
+ if (opt & 1)
toomany = xatoi_u(stoomany);
- }
- argc -= optind;
argv += optind;
-
- uid = getuid();
- if (uid != 0)
- CONFIG = NULL;
- if (argc > 0)
- CONFIG = argv[0];
- if (CONFIG == NULL)
+ argc -= optind;
+ if (argc)
+ config_filename = argv[0];
+ if (config_filename == NULL)
bb_error_msg_and_die("non-root must specify a config file");
-#ifdef BB_NOMMU
- if (!(opt & 2)) {
- /* reexec for vfork() do continue parent */
- vfork_daemon_rexec(0, 0, argc, argv, "-f");
- }
- bb_sanitize_stdio(0);
-#else
- bb_sanitize_stdio(!(opt & 2));
-#endif
+ if (!(opt & 2))
+ bb_daemonize_or_rexec(0, argv - optind);
+ else
+ bb_sanitize_stdio();
+ openlog(applet_name, LOG_PID | LOG_NOWAIT, LOG_DAEMON);
logmode = LOGMODE_SYSLOG;
if (uid == 0) {
setgroups(1, &gid);
}
- {
- FILE *fp = fopen(_PATH_INETDPID, "w");
- if (fp != NULL) {
- fprintf(fp, "%u\n", getpid());
- fclose(fp);
- }
- }
+ write_pidfile(_PATH_INETDPID);
if (getrlimit(RLIMIT_NOFILE, &rlim_ofile) < 0) {
bb_perror_msg("getrlimit");
(*sep->se_bi->bi_fn)(ctrl, sep);
} else
#endif
- {
+ {
pwd = getpwnam(sep->se_user);
if (pwd == NULL) {
bb_error_msg("getpwnam: %s: no such user", sep->se_user);
sigaction(SIGPIPE, &sapipe, NULL);
execv(sep->se_server, sep->se_argv);
bb_perror_msg("execv %s", sep->se_server);
-do_exit1:
+ do_exit1:
if (sep->se_socktype != SOCK_STREAM)
recv(0, buf, sizeof(buf), 0);
_exit(1);
*/
#define BUFSIZE 4096
-#if defined(CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO) || \
- defined(CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN) || \
- defined(CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME)
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_ECHO || \
+ ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN || \
+ ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
static int dg_badinput(struct sockaddr_in *dg_sin)
{
if (ntohs(dg_sin->sin_port) < IPPORT_RESERVED)
}
#endif
-#ifdef CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_ECHO
/* Echo service -- echo data back */
/* ARGSUSED */
static void
return;
(void) sendto(s, buffer, i, 0, &sa, sizeof(sa));
}
-#endif /* CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO */
+#endif /* FEATURE_INETD_SUPPORT_BUILTIN_ECHO */
-#ifdef CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
/* Discard service -- ignore data */
/* ARGSUSED */
static void
(void) read(s, buffer, sizeof(buffer));
}
-#endif /* CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD */
+#endif /* FEATURE_INETD_SUPPORT_BUILTIN_DISCARD */
-#ifdef CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
#define LINESIZ 72
static char ring[128];
static char *endring;
text[LINESIZ + 1] = '\n';
(void) sendto(s, text, sizeof(text), 0, &sa, sizeof(sa));
}
-#endif /* CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN */
+#endif /* FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN */
-#ifdef CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_TIME
/*
* Return a machine readable date and time, in the form of the
* number of seconds since midnight, Jan 1, 1900. Since gettimeofday
* some seventy years Bell Labs was asleep.
*/
-static u_int machtime(void)
+static unsigned machtime(void)
{
struct timeval tv;
fprintf(stderr, "Unable to get time of day\n");
return 0L;
}
- return htonl((u_int) tv.tv_sec + 2208988800UL);
+ return htonl((unsigned) tv.tv_sec + 2208988800UL);
}
/* ARGSUSED */
static void
machtime_stream(int s, servtab_t *sep ATTRIBUTE_UNUSED)
{
- u_int result;
+ unsigned result;
result = machtime();
(void) write(s, (char *) &result, sizeof(result));
static void
machtime_dg(int s, servtab_t *sep ATTRIBUTE_UNUSED)
{
- u_int result;
+ unsigned result;
/* struct sockaddr_storage ss; */
struct sockaddr sa;
struct sockaddr_in *dg_sin;
result = machtime();
(void) sendto(s, (char *) &result, sizeof(result), 0, &sa, sizeof(sa));
}
-#endif /* CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME */
+#endif /* FEATURE_INETD_SUPPORT_BUILTIN_TIME */
-#ifdef CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
+#if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
/* Return human-readable time of day */
/* ARGSUSED */
static void daytime_stream(int s, servtab_t *sep ATTRIBUTE_UNUSED)
{
- char buffer[256];
+ char buffer[32];
time_t t;
t = time(NULL);
+// fdprintf instead?
(void) sprintf(buffer, "%.24s\r\n", ctime(&t));
(void) write(s, buffer, strlen(buffer));
}
(void) sprintf(buffer, "%.24s\r\n", ctime(&t));
(void) sendto(s, buffer, strlen(buffer), 0, &sa, sizeof(sa));
}
-#endif /* CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME */
+#endif /* FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME */
projects / oweals / busybox.git / blobdiff