#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 <linux/unistd.h>
-#ifndef socklen_t
-typedef unsigned int socklen_t;
-#endif
+#if ! defined __GLIBC__ && ! defined __UCLIBC__
-#if __GNU_LIBRARY__ < 5
+typedef unsigned int socklen_t;
#ifndef __alpha__
# define __NR_klogctl __NR_syslog
/* 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"
/* localhost's name */
static char LocalHostName[32];
-static const char syslogd_usage[] =
- "syslogd [OPTION]...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\nLinux 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 NUM\t\tInterval between MARK lines (default=20min, 0=off)\n"
- "\t-n\t\tRun as a foreground process\n"
-#ifdef BB_KLOGD
- "\t-K\t\tDo not start up the klogd process\n"
-#endif
- "\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)\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
- ;
/* 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)
while (isdigit (*(++p))) {
pri = 10 * pri + (*p - '0');
}
- if (pri & ~(LOG_FACMASK | LOG_PRIMASK))
+ if (pri & ~(LOG_FACMASK | LOG_PRIMASK)){
pri = (LOG_USER | LOG_NOTICE);
+ }
} else if (c == '\n') {
*q++ = ' ';
} else if (iscntrl (c) && (c < 0177)) {
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)
{
/* 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\n", strerror (errno));
+ fatalError ("Could not resolve path to " _PATH_LOG ": %s\n", strerror (errno));
unlink (lfile);
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)
+ if (pid == 0) {
serveConnection (conn);
+ close (conn);
+ exit( TRUE);
+ }
close (conn);
}
}
}
}
-#ifdef BB_KLOGD
+#ifdef BB_FEATURE_KLOGD
static void klogd_signal(int sig)
{
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 ")");
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);
}
umask(0);
-#ifdef BB_KLOGD
+#ifdef BB_FEATURE_KLOGD
/* Start up the klogd process */
if (startKlogd == TRUE) {
klogd_pid = fork();