* Copyright (C) 1999,2000 by Lineo, inc.
* Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
*
+ * Copyright (C) 2000 by Karl M. Hegbloom <karlheg@debian.org>
+ *
* 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
*
*/
-#include "internal.h"
+#include "busybox.h"
+#include <stdio.h>
+#include <stdlib.h>
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
#include <paths.h>
#include <signal.h>
#include <stdarg.h>
-#include <stdio.h>
-#include <sys/klog.h>
+#include <time.h>
+#include <string.h>
+#include <unistd.h>
#include <sys/socket.h>
-#include <sys/stat.h>
#include <sys/types.h>
#include <sys/un.h>
-#include <time.h>
-#include <unistd.h>
+#include <sys/param.h>
+
+#if ! defined __GLIBC__ && ! defined __UCLIBC__
+#include <sys/syscall.h>
+#include <linux/unistd.h>
+typedef unsigned int socklen_t;
+
+#ifndef __alpha__
+# define __NR_klogctl __NR_syslog
+static inline _syscall3(int, klogctl, int, type, char *, b, int, len);
+#else /* __alpha__ */
+#define klogctl syslog
+#endif
+
+#else
+# include <sys/klog.h>
+#endif
-#define ksyslog klogctl
-extern int ksyslog(int type, char *buf, int len);
/* SYSLOG_NAMES defined to pull some extra junk from syslog.h */
#define SYSLOG_NAMES
#include <sys/syslog.h>
+#include <sys/uio.h>
/* Path for the file where all log messages are written */
#define __LOG_FILE "/var/log/messages"
/* Path to the unix socket */
-char lfile[PATH_MAX] = "";
+char lfile[BUFSIZ] = "";
static char *logFilePath = __LOG_FILE;
/* localhost's name */
static char LocalHostName[32];
-static const char syslogd_usage[] =
- "syslogd [OPTION]...\n\n"
- "Linux system and kernel (provides klogd) logging utility.\n"
- "Note that this version of syslogd/klogd ignores /etc/syslog.conf.\n\n"
- "Options:\n"
- "\t-m\tChange the mark timestamp interval. default=20min. 0=off\n"
- "\t-n\tDo not fork into the background (for when run by init)\n"
-#ifdef BB_KLOGD
- "\t-K\tDo not start up the klogd process (by default syslogd spawns klogd).\n"
+#ifdef BB_FEATURE_REMOTE_LOG
+#include <netinet/in.h>
+/* udp socket for logging to remote host */
+static int remotefd = -1;
+/* where do we log? */
+static char *RemoteHost;
+/* what port to log to? */
+static int RemotePort = 514;
+/* To remote log or not to remote log, that is the question. */
+static int doRemoteLog = FALSE;
+static int local_logging = FALSE;
#endif
- "\t-O\tSpecify an alternate log file. default=/var/log/messages\n";
/* Note: There is also a function called "message()" in init.c */
/* Print a message to the log file. */
-static void message(char *fmt, ...)
- __attribute__ ((format (printf, 1, 2)));
-static void message(char *fmt, ...)
+static void message (char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
+static void message (char *fmt, ...)
{
int fd;
+ struct flock fl;
va_list arguments;
- if ( (fd = device_open(logFilePath,
- O_WRONLY | O_CREAT | O_NOCTTY | O_APPEND |
- O_NONBLOCK)) >= 0) {
- va_start(arguments, fmt);
- vdprintf(fd, fmt, arguments);
- va_end(arguments);
- close(fd);
+ fl.l_whence = SEEK_SET;
+ fl.l_start = 0;
+ fl.l_len = 1;
+
+ if ((fd = device_open (logFilePath,
+ O_WRONLY | O_CREAT | O_NOCTTY | O_APPEND |
+ O_NONBLOCK)) >= 0) {
+ fl.l_type = F_WRLCK;
+ fcntl (fd, F_SETLKW, &fl);
+ va_start (arguments, fmt);
+ vdprintf (fd, fmt, arguments);
+ va_end (arguments);
+ fl.l_type = F_UNLCK;
+ fcntl (fd, F_SETLKW, &fl);
+ close (fd);
} else {
/* Always send console messages to /dev/console so people will see them. */
- if ( (fd = device_open(_PATH_CONSOLE,
- O_WRONLY | O_NOCTTY | O_NONBLOCK)) >= 0) {
- va_start(arguments, fmt);
- vdprintf(fd, fmt, arguments);
- va_end(arguments);
- close(fd);
+ if ((fd = device_open (_PATH_CONSOLE,
+ O_WRONLY | O_NOCTTY | O_NONBLOCK)) >= 0) {
+ va_start (arguments, fmt);
+ vdprintf (fd, fmt, arguments);
+ va_end (arguments);
+ close (fd);
} else {
- fprintf(stderr, "Bummer, can't print: ");
- va_start(arguments, fmt);
- vfprintf(stderr, fmt, arguments);
- fflush(stderr);
- va_end(arguments);
+ fprintf (stderr, "Bummer, can't print: ");
+ va_start (arguments, fmt);
+ vfprintf (stderr, fmt, arguments);
+ fflush (stderr);
+ va_end (arguments);
}
}
}
-static void logMessage(int pri, char *msg)
+static void logMessage (int pri, char *msg)
{
time_t now;
char *timestamp;
if (pri != 0) {
for (c_fac = facilitynames;
- c_fac->c_name && !(c_fac->c_val == LOG_FAC(pri) << 3); c_fac++);
+ c_fac->c_name && !(c_fac->c_val == LOG_FAC(pri) << 3); c_fac++);
for (c_pri = prioritynames;
- c_pri->c_name && !(c_pri->c_val == LOG_PRI(pri)); c_pri++);
- if (*c_fac->c_name == '\0' || *c_pri->c_name == '\0')
+ c_pri->c_name && !(c_pri->c_val == LOG_PRI(pri)); c_pri++);
+ if (c_fac->c_name == NULL || c_pri->c_name == NULL)
snprintf(res, sizeof(res), "<%d>", pri);
else
snprintf(res, sizeof(res), "%s.%s", c_fac->c_name, c_pri->c_name);
}
if (strlen(msg) < 16 || msg[3] != ' ' || msg[6] != ' ' ||
- msg[9] != ':' || msg[12] != ':' || msg[15] != ' ') {
+ msg[9] != ':' || msg[12] != ':' || msg[15] != ' ') {
time(&now);
timestamp = ctime(&now) + 4;
timestamp[15] = '\0';
/* todo: supress duplicates */
- /* now spew out the message to wherever it is supposed to go */
- message("%s %s %s %s\n", timestamp, LocalHostName, res, msg);
+#ifdef BB_FEATURE_REMOTE_LOG
+ /* send message to remote logger */
+ if ( -1 != remotefd){
+static const int IOV_COUNT = 2;
+ struct iovec iov[IOV_COUNT];
+ struct iovec *v = iov;
+
+ bzero(&res, sizeof(res));
+ snprintf(res, sizeof(res), "<%d>", pri);
+ v->iov_base = res ;
+ v->iov_len = strlen(res);
+ v++;
+
+ v->iov_base = msg;
+ v->iov_len = strlen(msg);
+
+ if ( -1 == writev(remotefd,iov, IOV_COUNT)){
+ error_msg_and_die("syslogd: cannot write to remote file handle on"
+ "%s:%d\n",RemoteHost,RemotePort);
+ }
+ }
+ if (local_logging == TRUE)
+#endif
+ /* now spew out the message to wherever it is supposed to go */
+ message("%s %s %s %s\n", timestamp, LocalHostName, res, msg);
+
+
}
static void quit_signal(int sig)
}
}
+static const int BUFSIZE = 1023;
+static int serveConnection (int conn)
+{
+ RESERVE_BB_BUFFER(buf, BUFSIZE + 1);
+ int n_read;
+
+ while ((n_read = read (conn, buf, BUFSIZE )) > 0) {
+
+ int pri = (LOG_USER | LOG_NOTICE);
+ char line[ BUFSIZE + 1 ];
+ unsigned char c;
+
+ char *p = buf, *q = line;
+
+ buf[ n_read - 1 ] = '\0';
+
+ while (p && (c = *p) && q < &line[ sizeof (line) - 1 ]) {
+ if (c == '<') {
+ /* Parse the magic priority number. */
+ pri = 0;
+ while (isdigit (*(++p))) {
+ pri = 10 * pri + (*p - '0');
+ }
+ if (pri & ~(LOG_FACMASK | LOG_PRIMASK)){
+ pri = (LOG_USER | LOG_NOTICE);
+ }
+ } else if (c == '\n') {
+ *q++ = ' ';
+ } else if (iscntrl (c) && (c < 0177)) {
+ *q++ = '^';
+ *q++ = c ^ 0100;
+ } else {
+ *q++ = c;
+ }
+ p++;
+ }
+ *q = '\0';
+ /* Now log it */
+ logMessage (pri, line);
+ }
+ return (0);
+}
+
+
+#ifdef BB_FEATURE_REMOTE_LOG
+static void init_RemoteLog (void){
+
+ struct sockaddr_in remoteaddr;
+ struct hostent *hostinfo;
+ int len = sizeof(remoteaddr);
+
+ bzero(&remoteaddr, len);
+
+ remotefd = socket(AF_INET, SOCK_DGRAM, 0);
+
+ if (remotefd < 0) {
+ error_msg_and_die("syslogd: cannot create socket\n");
+ }
+
+ hostinfo = (struct hostent *) gethostbyname(RemoteHost);
+
+ if (!hostinfo) {
+ error_msg_and_die("syslogd: cannot resolve remote host name [%s]\n", RemoteHost);
+ }
+
+ remoteaddr.sin_family = AF_INET;
+ remoteaddr.sin_addr = *(struct in_addr *) *hostinfo->h_addr_list;
+ remoteaddr.sin_port = htons(RemotePort);
+
+ /*
+ Since we are using UDP sockets, connect just sets the default host and port
+ for future operations
+ */
+ if ( 0 != (connect(remotefd, (struct sockaddr *) &remoteaddr, len))){
+ error_msg_and_die("syslogd: cannot connect to remote host %s:%d\n", RemoteHost, RemotePort);
+ }
+
+}
+#endif
+
static void doSyslogd (void) __attribute__ ((noreturn));
static void doSyslogd (void)
{
struct sockaddr_un sunx;
- size_t addrLength;
+ socklen_t addrLength;
+
+
int sock_fd;
- fd_set readfds;
- char lfile[PATH_MAX];
+ fd_set fds;
- /* Set up sig handlers */
+ RESERVE_BB_BUFFER(lfile, BUFSIZ);
+
+ /* Set up signal handlers. */
signal (SIGINT, quit_signal);
signal (SIGTERM, quit_signal);
signal (SIGQUIT, quit_signal);
signal (SIGHUP, SIG_IGN);
+ signal (SIGCHLD, SIG_IGN);
+#ifdef SIGCLD
+ signal (SIGCLD, SIG_IGN);
+#endif
signal (SIGALRM, domark);
alarm (MarkInterval);
- /* create the syslog file so realpath() can work */
- close(open(_PATH_LOG, O_RDWR | O_CREAT, 0644));
- if (realpath(_PATH_LOG, lfile) == NULL) {
- fatalError("Could not resolv path to " _PATH_LOG);
- }
+ /* Create the syslog file so realpath() can work. */
+ close (open (_PATH_LOG, O_RDWR | O_CREAT, 0644));
+ if (realpath (_PATH_LOG, lfile) == NULL)
+ perror_msg_and_die ("Could not resolve path to " _PATH_LOG);
unlink (lfile);
- memset (&sunx, 0, sizeof(sunx));
-
+ memset (&sunx, 0, sizeof (sunx));
sunx.sun_family = AF_UNIX;
- strncpy (sunx.sun_path, lfile, sizeof(sunx.sun_path));
- if ((sock_fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
- fatalError ("Couldn't obtain descriptor for socket " _PATH_LOG);
- }
+ strncpy (sunx.sun_path, lfile, sizeof (sunx.sun_path));
+ if ((sock_fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
+ perror_msg_and_die ("Couldn't obtain descriptor for socket " _PATH_LOG);
addrLength = sizeof (sunx.sun_family) + strlen (sunx.sun_path);
- if ((bind (sock_fd, (struct sockaddr *) &sunx, addrLength)) ||
- (listen (sock_fd, 5))) {
- fatalError ("Could not connect to socket " _PATH_LOG);
- }
+ if ((bind (sock_fd, (struct sockaddr *) &sunx, addrLength)) || (listen (sock_fd, 5)))
+ perror_msg_and_die ("Could not connect to socket " _PATH_LOG);
- if (chmod (lfile, 0666) < 0) {
- fatalError ("Could not set permission on " _PATH_LOG);
- }
+ if (chmod (lfile, 0666) < 0)
+ perror_msg_and_die ("Could not set permission on " _PATH_LOG);
+
+ FD_ZERO (&fds);
+ FD_SET (sock_fd, &fds);
- FD_ZERO (&readfds);
- FD_SET (sock_fd, &readfds);
+ #ifdef BB_FEATURE_REMOTE_LOG
+ if (doRemoteLog == TRUE){
+ init_RemoteLog();
+ }
+ #endif
logMessage (0, "syslogd started: BusyBox v" BB_VER " (" BB_BT ")");
for (;;) {
- int n_ready;
- int fd;
+
+ fd_set readfds;
+ int n_ready;
+ int fd;
+
+ memcpy (&readfds, &fds, sizeof (fds));
if ((n_ready = select (FD_SETSIZE, &readfds, NULL, NULL, NULL)) < 0) {
if (errno == EINTR) continue; /* alarm may have happened. */
- fatalError( "select error: %s\n", strerror(errno));
+ perror_msg_and_die ("select error");
}
- /* Skip stdin, stdout, stderr */
- for (fd = 3; fd < FD_SETSIZE; fd++) {
+ for (fd = 0; (n_ready > 0) && (fd < FD_SETSIZE); fd++) {
if (FD_ISSET (fd, &readfds)) {
+
+ --n_ready;
+
if (fd == sock_fd) {
- int conn;
- if ((conn = accept(sock_fd, (struct sockaddr *) &sunx,
- &addrLength)) < 0) {
- fatalError( "accept error: %s\n", strerror(errno));
+
+ int conn;
+ pid_t pid;
+
+ if ((conn = accept (sock_fd, (struct sockaddr *) &sunx, &addrLength)) < 0) {
+ perror_msg_and_die ("accept error");
}
- FD_SET (conn, &readfds);
- }
- else {
-#define BUFSIZE 1024 + 1
- char buf;
- char *q, *p;
- int n_read;
- char line[BUFSIZE];
- unsigned char c;
- int pri;
-
- /* Get set to read in a line */
- memset (line, 0, sizeof(line));
- pri = (LOG_USER | LOG_NOTICE);
- /* Keep reading stuff till there is nothing else to read */
- while( (n_read = read (fd, &buf, 1)) > 0) {
- p = &buf;
- q = line;
- while (p && (c = *p) && q < &line[sizeof(line) - 1]) {
- if (c == '<') {
- /* Parse the magic priority number */
- pri = 0;
- while (isdigit(*(++p))) {
- pri = 10 * pri + (*p - '0');
- }
- if (pri & ~(LOG_FACMASK | LOG_PRIMASK))
- pri = (LOG_USER | LOG_NOTICE);
- } else if (c == '\n') {
- *q++ = ' ';
- } else if (iscntrl(c) && (c < 0177)) {
- *q++ = '^';
- *q++ = c ^ 0100;
- } else {
- *q++ = c;
- }
- p++;
- }
- *q = '\0';
-
- /* Now log it */
- logMessage(pri, line);
- break;
+ pid = fork();
+
+ if (pid < 0) {
+ perror ("syslogd: fork");
+ close (conn);
+ continue;
}
- close (fd);
- FD_CLR (fd, &readfds);
+
+ if (pid == 0) {
+ serveConnection (conn);
+ close (conn);
+ exit( TRUE);
+ }
+ close (conn);
}
}
}
}
}
-#ifdef BB_KLOGD
+#ifdef BB_FEATURE_KLOGD
static void klogd_signal(int sig)
{
- ksyslog(7, NULL, 0);
- ksyslog(0, 0, 0);
+ klogctl(7, NULL, 0);
+ klogctl(0, 0, 0);
logMessage(0, "Kernel log daemon exiting.");
exit(TRUE);
}
{
int priority = LOG_INFO;
char log_buffer[4096];
- char *logp;
+ int i, n, lastc;
+ char *start;
/* Set up sig handlers */
signal(SIGINT, klogd_signal);
signal(SIGKILL, klogd_signal);
signal(SIGTERM, klogd_signal);
signal(SIGHUP, SIG_IGN);
+
+#ifdef BB_FEATURE_REMOTE_LOG
+ if (doRemoteLog == TRUE){
+ init_RemoteLog();
+ }
+#endif
+
logMessage(0, "klogd started: "
"BusyBox v" BB_VER " (" BB_BT ")");
- ksyslog(1, NULL, 0);
+ /* "Open the log. Currently a NOP." */
+ klogctl(1, NULL, 0);
while (1) {
/* Use kernel syscalls */
memset(log_buffer, '\0', sizeof(log_buffer));
- if (ksyslog(2, log_buffer, sizeof(log_buffer)) < 0) {
+ n = klogctl(2, log_buffer, sizeof(log_buffer));
+ if (n < 0) {
char message[80];
if (errno == EINTR)
logMessage(LOG_SYSLOG | LOG_ERR, message);
exit(1);
}
- logp = log_buffer;
- if (*log_buffer == '<') {
- switch (*(log_buffer + 1)) {
- case '0':
- priority = LOG_EMERG;
- break;
- case '1':
- priority = LOG_ALERT;
- break;
- case '2':
- priority = LOG_CRIT;
- break;
- case '3':
- priority = LOG_ERR;
- break;
- case '4':
- priority = LOG_WARNING;
- break;
- case '5':
- priority = LOG_NOTICE;
- break;
- case '6':
+
+ /* klogctl buffer parsing modelled after code in dmesg.c */
+ start=&log_buffer[0];
+ lastc='\0';
+ for (i=0; i<n; i++) {
+ if (lastc == '\0' && log_buffer[i] == '<') {
+ priority = 0;
+ i++;
+ while (isdigit(log_buffer[i])) {
+ priority = priority*10+(log_buffer[i]-'0');
+ i++;
+ }
+ if (log_buffer[i] == '>') i++;
+ start = &log_buffer[i];
+ }
+ if (log_buffer[i] == '\n') {
+ log_buffer[i] = '\0'; /* zero terminate this message */
+ logMessage(LOG_KERN | priority, start);
+ start = &log_buffer[i+1];
priority = LOG_INFO;
- break;
- case '7':
- default:
- priority = LOG_DEBUG;
}
- logp += 3;
+ lastc = log_buffer[i];
}
- logMessage(LOG_KERN | priority, logp);
}
}
#endif
-static void daemon_init (char **argv, char *dz, void fn (void)) __attribute__ ((noreturn));
static void daemon_init (char **argv, char *dz, void fn (void))
{
setsid();
extern int syslogd_main(int argc, char **argv)
{
- int pid, klogd_pid;
+ int opt, pid, klogd_pid;
int doFork = TRUE;
-#ifdef BB_KLOGD
+#ifdef BB_FEATURE_KLOGD
int startKlogd = TRUE;
#endif
- int stopDoingThat = FALSE;
char *p;
- char **argv1 = argv;
- while (--argc > 0 && **(++argv1) == '-') {
- stopDoingThat = FALSE;
- while (stopDoingThat == FALSE && *(++(*argv1))) {
- switch (**argv1) {
+ /* do normal option parsing */
+ while ((opt = getopt(argc, argv, "m:nKO:R:L")) > 0) {
+ switch (opt) {
case 'm':
- if (--argc == 0) {
- usage(syslogd_usage);
- }
- MarkInterval = atoi(*(++argv1)) * 60;
+ MarkInterval = atoi(optarg) * 60;
break;
case 'n':
doFork = FALSE;
break;
-#ifdef BB_KLOGD
+#ifdef BB_FEATURE_KLOGD
case 'K':
startKlogd = FALSE;
break;
#endif
case 'O':
- if (--argc == 0) {
- usage(syslogd_usage);
- }
- logFilePath = *(++argv1);
- stopDoingThat = TRUE;
+ logFilePath = strdup(optarg);
+ break;
+#ifdef BB_FEATURE_REMOTE_LOG
+ case 'R':
+ RemoteHost = strdup(optarg);
+ if ( (p = strchr(RemoteHost, ':'))){
+ RemotePort = atoi(p+1);
+ *p = '\0';
+ }
+ doRemoteLog = TRUE;
break;
+ case 'L':
+ local_logging = TRUE;
+ break;
+#endif
default:
usage(syslogd_usage);
- }
}
}
+#ifdef BB_FEATURE_REMOTE_LOG
+ /* If they have not specified remote logging, then log locally */
+ if (doRemoteLog == FALSE)
+ local_logging = TRUE;
+#endif
+
/* Store away localhost's name before the fork */
gethostname(LocalHostName, sizeof(LocalHostName));
if ((p = strchr(LocalHostName, '.'))) {
umask(0);
-#ifdef BB_KLOGD
+#ifdef BB_FEATURE_KLOGD
/* Start up the klogd process */
if (startKlogd == TRUE) {
klogd_pid = fork();
doSyslogd();
}
- exit(TRUE);
+ return EXIT_SUCCESS;
}
/*
- * Local Variables
- * c-file-style: "linux"
- * c-basic-offset: 4
- * tab-width: 4
- * End:
- */
+Local Variables
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/