X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=syslogd.c;h=9a4af49269038816cf23c25fcd860650120692bb;hb=0024abcbbc633f4493b97c4b344ed636ea176f3c;hp=db535044c32b22a28ab604355e56a7c2fb8690d0;hpb=e49d5ecbbe51718fa925b6890a735e5937cc2aa2;p=oweals%2Fbusybox.git diff --git a/syslogd.c b/syslogd.c index db535044c..9a4af4926 100644 --- a/syslogd.c +++ b/syslogd.c @@ -2,9 +2,11 @@ /* * Mini syslogd implementation for busybox * - * Copyright (C) 1999 by Lineo, inc. + * Copyright (C) 1999,2000 by Lineo, inc. * Written by Erik Andersen , * + * Copyright (C) 2000 by Karl M. Hegbloom + * * 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 @@ -22,21 +24,22 @@ */ #include "internal.h" -#include +#include +#include +#include +#include +#include +#include #include +#include +#include #include +#include +#include #include -#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #define ksyslog klogctl extern int ksyslog(int type, char *buf, int len); @@ -47,8 +50,10 @@ extern int ksyslog(int type, char *buf, int len); #include /* Path for the file where all log messages are written */ -#define __LOG_FILE "/var/log/messages" +#define __LOG_FILE "/var/log/messages" +/* Path to the unix socket */ +char lfile[BUFSIZ] = ""; static char *logFilePath = __LOG_FILE; @@ -59,8 +64,9 @@ static int MarkInterval = 20 * 60; static char LocalHostName[32]; static const char syslogd_usage[] = - "syslogd [OPTION]...\n\n" - "Linux system and kernel (provides klogd) logging utility.\n" + "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\tChange the mark timestamp interval. default=20min. 0=off\n" @@ -68,59 +74,69 @@ static const char syslogd_usage[] = #ifdef BB_KLOGD "\t-K\tDo not start up the klogd process (by default syslogd spawns klogd).\n" #endif - "\t-O\tSpecify an alternate log file. default=/var/log/messages\n"; - + "\t-O\tSpecify an alternate log file. default=/var/log/messages\n" +#endif + ; -/* print a message to the log file */ -static void message(char *fmt, ...) +/* 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, ...) { 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; - static char res[20]; + static char res[20] = ""; CODE *c_pri, *c_fac; - for (c_fac = facilitynames; - 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') - snprintf(res, sizeof(res), "<%d>", pri); - else - snprintf(res, sizeof(res), "%s.%s", c_fac->c_name, c_pri->c_name); + if (pri != 0) { + for (c_fac = facilitynames; + 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') + 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] != ' ') { @@ -141,17 +157,11 @@ static void logMessage(int pri, char *msg) static void quit_signal(int sig) { - logMessage(LOG_SYSLOG | LOG_INFO, "System log daemon exiting."); - unlink(_PATH_LOG); + logMessage(0, "System log daemon exiting."); + unlink(lfile); exit(TRUE); } -static void restart_signal(int sig) -{ - /* pretend to restart */ - logMessage(LOG_SYSLOG | LOG_INFO, "syslogd restarting"); -} - static void domark(int sig) { if (MarkInterval > 0) { @@ -160,89 +170,133 @@ static void domark(int sig) } } -static void doSyslogd(void) +static void doSyslogd (void) __attribute__ ((noreturn)); +static void doSyslogd (void) { struct sockaddr_un sunx; - int fd, conn; - size_t addrLength; - char buf[1024]; - char *q, *p = buf; - int readSize; + socklen_t addrLength; - /* Set up sig handlers */ - signal(SIGINT, quit_signal); - signal(SIGTERM, quit_signal); - signal(SIGQUIT, quit_signal); - signal(SIGHUP, restart_signal); - signal(SIGALRM, domark); - alarm(MarkInterval); - - /* Remove any preexisting socket/file */ - unlink(_PATH_LOG); - - memset(&sunx, 0, sizeof(sunx)); - sunx.sun_family = AF_UNIX; /* Unix domain socket */ - strncpy(sunx.sun_path, _PATH_LOG, sizeof(sunx.sun_path)); - if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { - perror("Couldn't obtain descriptor for socket " _PATH_LOG); - exit(FALSE); - } - addrLength = sizeof(sunx.sun_family) + strlen(sunx.sun_path); - if ((bind(fd, (struct sockaddr *) &sunx, addrLength)) || - (listen(fd, 5))) { - perror("Could not connect to socket " _PATH_LOG); - exit(FALSE); - } + int sock_fd; + fd_set fds; - umask(0); - if (chmod(_PATH_LOG, 0666) < 0) { - perror("Could not set permission on " _PATH_LOG); - exit(FALSE); - } + char lfile[BUFSIZ]; - logMessage(LOG_SYSLOG | LOG_INFO, "syslogd started: " - "BusyBox v" BB_VER " (" BB_BT ")"); + /* Set up signal handlers. */ + signal (SIGINT, quit_signal); + signal (SIGTERM, quit_signal); + signal (SIGQUIT, quit_signal); + signal (SIGHUP, SIG_IGN); + signal (SIGCLD, SIG_IGN); + 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 ": %s\n", strerror (errno)); + + unlink (lfile); + + 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 ": %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\n", strerror (errno)); + + if (chmod (lfile, 0666) < 0) + fatalError ("Could not set permission on " _PATH_LOG ": %s\n", strerror (errno)); + + FD_ZERO (&fds); + FD_SET (sock_fd, &fds); + logMessage (0, "syslogd started: BusyBox v" BB_VER " (" BB_BT ")"); - while ((conn = accept(fd, (struct sockaddr *) &sunx, - &addrLength)) >= 0) { - while ((readSize = read(conn, buf, sizeof(buf))) > 0) { - char line[1025]; - unsigned char c; - int pri = (LOG_USER | LOG_NOTICE); - - memset(line, 0, sizeof(line)); - 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'); + for (;;) { + + 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)); + } + + for (fd = 0; (n_ready > 0) && (fd < FD_SETSIZE); fd++) { + if (FD_ISSET (fd, &readfds)) { + + --n_ready; + + if (fd == sock_fd) { + + int conn; + pid_t pid; + + if ((conn = accept (sock_fd, (struct sockaddr *) &sunx, &addrLength)) < 0) { + fatalError ("accept error: %s\n", strerror (errno)); } - 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; + + pid = fork(); + + if (pid < 0) { + perror ("syslogd: fork"); + close (conn); + 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); + } + close (conn); } - p++; } - *q = '\0'; - - /* Now log it */ - logMessage(pri, line); } - close(conn); } - - close(fd); } #ifdef BB_KLOGD @@ -251,11 +305,12 @@ static void klogd_signal(int sig) { ksyslog(7, NULL, 0); ksyslog(0, 0, 0); - logMessage(LOG_SYSLOG | LOG_INFO, "Kernel log daemon exiting."); + logMessage(0, "Kernel log daemon exiting."); exit(TRUE); } -static void doKlogd(void) +static void doKlogd (void) __attribute__ ((noreturn)); +static void doKlogd (void) { int priority = LOG_INFO; char log_buffer[4096]; @@ -265,8 +320,8 @@ static void doKlogd(void) signal(SIGINT, klogd_signal); signal(SIGKILL, klogd_signal); signal(SIGTERM, klogd_signal); - signal(SIGHUP, klogd_signal); - logMessage(LOG_SYSLOG | LOG_INFO, "klogd started: " + signal(SIGHUP, SIG_IGN); + logMessage(0, "klogd started: " "BusyBox v" BB_VER " (" BB_BT ")"); ksyslog(1, NULL, 0); @@ -321,6 +376,15 @@ static void doKlogd(void) #endif +static void daemon_init (char **argv, char *dz, void fn (void)) +{ + setsid(); + chdir ("/"); + strncpy(argv[0], dz, strlen(argv[0])); + fn(); + exit(0); +} + extern int syslogd_main(int argc, char **argv) { int pid, klogd_pid; @@ -370,28 +434,36 @@ extern int syslogd_main(int argc, char **argv) *p++ = '\0'; } - if (doFork == TRUE) { - pid = fork(); - if (pid < 0) - exit(pid); - else if (pid == 0) { - strncpy(argv[0], "syslogd", strlen(argv[0])); - doSyslogd(); - } - } else { - doSyslogd(); - } + umask(0); #ifdef BB_KLOGD /* Start up the klogd process */ if (startKlogd == TRUE) { klogd_pid = fork(); if (klogd_pid == 0) { - strncpy(argv[0], "klogd", strlen(argv[0])); - doKlogd(); + daemon_init (argv, "klogd", doKlogd); } } #endif + if (doFork == TRUE) { + pid = fork(); + if (pid < 0) + exit(pid); + else if (pid == 0) { + daemon_init (argv, "syslogd", doSyslogd); + } + } else { + doSyslogd(); + } + exit(TRUE); } + +/* +Local Variables +c-file-style: "linux" +c-basic-offset: 4 +tab-width: 4 +End: +*/