*/
#include "internal.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 <unistd.h>
#include <sys/socket.h>
-#include <sys/stat.h>
#include <sys/types.h>
#include <sys/un.h>
#include <sys/param.h>
-#include <time.h>
-#include <unistd.h>
-#define ksyslog klogctl
-extern int ksyslog(int type, char *buf, int len);
+#if ! defined __GLIBC__ && ! defined __UCLIBC__
+
+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
+
/* 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;
#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. */
/* 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){
+#define 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)){
+ fatalError("syslogd: cannot write to remote file handle on"
+ "%s:%d\n",RemoteHost,RemotePort);
+ }
+ }
+#endif
+
}
static void quit_signal(int sig)
}
}
+#define BUFSIZE 1023
+static int serveConnection (int conn)
+{
+ char 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) {
+ fatalError("syslogd: cannot create socket\n");
+ }
+
+ hostinfo = (struct hostent *) gethostbyname(RemoteHost);
+
+ if (!hostinfo) {
+ fatalError("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))){
+ fatalError("syslogd: cannot connect to remote host %s:%d\n", RemoteHost, RemotePort);
+ }
+
+}
+#endif
+
static void doSyslogd (void) __attribute__ ((noreturn));
static void doSyslogd (void)
{
int sock_fd;
fd_set fds;
- char lfile[PATH_MAX];
+ char lfile[BUFSIZ];
/* Set up signal handlers. */
signal (SIGINT, quit_signal);
/* 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 ": %s", strerror (errno));
+ fatalError ("Could not resolve path to " _PATH_LOG ": %s\n", strerror (errno));
unlink (lfile);
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 ": %s", strerror (errno));
+ fatalError ("Couldn't obtain descriptor for socket " _PATH_LOG ": %s\n", strerror (errno));
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 ": %s", strerror (errno));
+ fatalError ("Could not connect to socket " _PATH_LOG ": %s\n", strerror (errno));
if (chmod (lfile, 0666) < 0)
- fatalError ("Could not set permission on " _PATH_LOG ": %s", strerror (errno));
+ fatalError ("Could not set permission on " _PATH_LOG ": %s\n", strerror (errno));
FD_ZERO (&fds);
FD_SET (sock_fd, &fds);
+ #ifdef BB_FEATURE_REMOTE_LOG
+ if (doRemoteLog == TRUE){
+ init_RemoteLog();
+ }
+ #endif
+
logMessage (0, "syslogd started: BusyBox v" BB_VER " (" BB_BT ")");
for (;;) {
continue;
}
- if (pid > 0) {
-
-# define BUFSIZE 1023
- char 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);
- }
- exit (0);
+ 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);
}
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);
+ 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) {
+ if (klogctl(2, log_buffer, sizeof(log_buffer)) < 0) {
char message[80];
if (errno == EINTR)
int pid, klogd_pid;
int doFork = TRUE;
-#ifdef BB_KLOGD
+#ifdef BB_FEATURE_KLOGD
int startKlogd = TRUE;
#endif
int stopDoingThat = FALSE;
case 'n':
doFork = FALSE;
break;
-#ifdef BB_KLOGD
+#ifdef BB_FEATURE_KLOGD
case 'K':
startKlogd = FALSE;
break;
logFilePath = *(++argv1);
stopDoingThat = TRUE;
break;
+#ifdef BB_FEATURE_REMOTE_LOG
+ case 'R':
+ if (--argc == 0) {
+ usage(syslogd_usage);
+ }
+ RemoteHost = *(++argv1);
+ if ( (p = strchr(RemoteHost, ':'))){
+ RemotePort = atoi(p+1);
+ *p = '\0';
+ }
+ doRemoteLog = TRUE;
+ stopDoingThat = TRUE;
+ break;
+#endif
default:
usage(syslogd_usage);
}
}
}
+ if (argc > 0)
+ usage(syslogd_usage);
+
/* 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(TRUE);
}
/*
projects / oweals / busybox.git / blobdiff