2000-02-09 01:28:47 +05:30
|
|
|
/* vi: set sw=4 ts=4: */
|
1999-11-25 13:00:46 +05:30
|
|
|
/*
|
|
|
|
* Mini syslogd implementation for busybox
|
|
|
|
*
|
2004-03-15 13:59:22 +05:30
|
|
|
* Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
|
1999-11-25 13:00:46 +05:30
|
|
|
*
|
2000-04-19 05:21:51 +05:30
|
|
|
* Copyright (C) 2000 by Karl M. Hegbloom <karlheg@debian.org>
|
|
|
|
*
|
2002-12-12 16:24:48 +05:30
|
|
|
* "circular buffer" Copyright (C) 2001 by Gennady Feldman <gfeldman@gena01.com>
|
2001-03-13 04:21:50 +05:30
|
|
|
*
|
2002-12-12 16:24:48 +05:30
|
|
|
* Maintainer: Gennady Feldman <gfeldman@gena01.com> as of Mar 12, 2001
|
2001-03-13 05:11:34 +05:30
|
|
|
*
|
2010-08-16 23:44:46 +05:30
|
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
1999-11-25 13:00:46 +05:30
|
|
|
*/
|
2015-10-18 22:12:03 +05:30
|
|
|
//config:config SYSLOGD
|
2018-12-28 07:50:17 +05:30
|
|
|
//config: bool "syslogd (13 kb)"
|
2015-10-18 22:12:03 +05:30
|
|
|
//config: default y
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: The syslogd utility is used to record logs of all the
|
|
|
|
//config: significant events that occur on a system. Every
|
|
|
|
//config: message that is logged records the date and time of the
|
|
|
|
//config: event, and will generally also record the name of the
|
|
|
|
//config: application that generated the message. When used in
|
|
|
|
//config: conjunction with klogd, messages from the Linux kernel
|
|
|
|
//config: can also be recorded. This is terribly useful,
|
|
|
|
//config: especially for finding what happened when something goes
|
|
|
|
//config: wrong. And something almost always will go wrong if
|
|
|
|
//config: you wait long enough....
|
2015-10-18 22:12:03 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_ROTATE_LOGFILE
|
|
|
|
//config: bool "Rotate message files"
|
|
|
|
//config: default y
|
|
|
|
//config: depends on SYSLOGD
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: This enables syslogd to rotate the message files
|
|
|
|
//config: on his own. No need to use an external rotate script.
|
2015-10-18 22:12:03 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_REMOTE_LOG
|
|
|
|
//config: bool "Remote Log support"
|
|
|
|
//config: default y
|
|
|
|
//config: depends on SYSLOGD
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: When you enable this feature, the syslogd utility can
|
|
|
|
//config: be used to send system log messages to another system
|
|
|
|
//config: connected via a network. This allows the remote
|
|
|
|
//config: machine to log all the system messages, which can be
|
|
|
|
//config: terribly useful for reducing the number of serial
|
|
|
|
//config: cables you use. It can also be a very good security
|
|
|
|
//config: measure to prevent system logs from being tampered with
|
|
|
|
//config: by an intruder.
|
2015-10-18 22:12:03 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_SYSLOGD_DUP
|
|
|
|
//config: bool "Support -D (drop dups) option"
|
|
|
|
//config: default y
|
|
|
|
//config: depends on SYSLOGD
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: Option -D instructs syslogd to drop consecutive messages
|
|
|
|
//config: which are totally the same.
|
2015-10-18 22:12:03 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_SYSLOGD_CFG
|
|
|
|
//config: bool "Support syslog.conf"
|
|
|
|
//config: default y
|
|
|
|
//config: depends on SYSLOGD
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: Supports restricted syslogd config. See docs/syslog.conf.txt
|
2015-10-18 22:12:03 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_SYSLOGD_READ_BUFFER_SIZE
|
|
|
|
//config: int "Read buffer size in bytes"
|
|
|
|
//config: default 256
|
|
|
|
//config: range 256 20000
|
|
|
|
//config: depends on SYSLOGD
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: This option sets the size of the syslog read buffer.
|
|
|
|
//config: Actual memory usage increases around five times the
|
|
|
|
//config: change done here.
|
2015-10-18 22:12:03 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_IPC_SYSLOG
|
|
|
|
//config: bool "Circular Buffer support"
|
|
|
|
//config: default y
|
|
|
|
//config: depends on SYSLOGD
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: When you enable this feature, the syslogd utility will
|
|
|
|
//config: use a circular buffer to record system log messages.
|
|
|
|
//config: When the buffer is filled it will continue to overwrite
|
|
|
|
//config: the oldest messages. This can be very useful for
|
|
|
|
//config: systems with little or no permanent storage, since
|
|
|
|
//config: otherwise system logs can eventually fill up your
|
|
|
|
//config: entire filesystem, which may cause your system to
|
|
|
|
//config: break badly.
|
2015-10-18 22:12:03 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_IPC_SYSLOG_BUFFER_SIZE
|
|
|
|
//config: int "Circular buffer size in Kbytes (minimum 4KB)"
|
|
|
|
//config: default 16
|
|
|
|
//config: range 4 2147483647
|
|
|
|
//config: depends on FEATURE_IPC_SYSLOG
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: This option sets the size of the circular buffer
|
|
|
|
//config: used to record system log messages.
|
2015-10-18 22:12:03 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_KMSG_SYSLOG
|
|
|
|
//config: bool "Linux kernel printk buffer support"
|
|
|
|
//config: default y
|
|
|
|
//config: depends on SYSLOGD
|
|
|
|
//config: select PLATFORM_LINUX
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: When you enable this feature, the syslogd utility will
|
|
|
|
//config: write system log message to the Linux kernel's printk buffer.
|
|
|
|
//config: This can be used as a smaller alternative to the syslogd IPC
|
|
|
|
//config: support, as klogd and logread aren't needed.
|
2015-10-18 22:12:03 +05:30
|
|
|
//config:
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: NOTICE: Syslog facilities in log entries needs kernel 3.5+.
|
2015-10-18 22:12:03 +05:30
|
|
|
|
|
|
|
//applet:IF_SYSLOGD(APPLET(syslogd, BB_DIR_SBIN, BB_SUID_DROP))
|
|
|
|
|
|
|
|
//kbuild:lib-$(CONFIG_SYSLOGD) += syslogd_and_logger.o
|
1999-11-24 14:34:33 +05:30
|
|
|
|
2011-04-11 06:59:49 +05:30
|
|
|
//usage:#define syslogd_trivial_usage
|
|
|
|
//usage: "[OPTIONS]"
|
|
|
|
//usage:#define syslogd_full_usage "\n\n"
|
2011-05-25 15:28:56 +05:30
|
|
|
//usage: "System logging utility\n"
|
|
|
|
//usage: IF_NOT_FEATURE_SYSLOGD_CFG(
|
|
|
|
//usage: "(this version of syslogd ignores /etc/syslog.conf)\n"
|
|
|
|
//usage: )
|
2011-04-11 06:59:49 +05:30
|
|
|
//usage: "\n -n Run in foreground"
|
|
|
|
//usage: IF_FEATURE_REMOTE_LOG(
|
2013-03-15 06:20:35 +05:30
|
|
|
//usage: "\n -R HOST[:PORT] Log to HOST:PORT (default PORT:514)"
|
2011-05-25 15:28:56 +05:30
|
|
|
//usage: "\n -L Log locally and via network (default is network only if -R)"
|
|
|
|
//usage: )
|
2011-04-11 06:59:49 +05:30
|
|
|
//usage: IF_FEATURE_IPC_SYSLOG(
|
|
|
|
/* NB: -Csize shouldn't have space (because size is optional) */
|
2011-05-25 15:28:56 +05:30
|
|
|
//usage: "\n -C[size_kb] Log to shared mem buffer (use logread to read it)"
|
|
|
|
//usage: )
|
2014-07-02 18:51:30 +05:30
|
|
|
//usage: IF_FEATURE_KMSG_SYSLOG(
|
|
|
|
//usage: "\n -K Log to kernel printk buffer (use dmesg to read it)"
|
|
|
|
//usage: )
|
2016-04-04 10:58:32 +05:30
|
|
|
//usage: "\n -O FILE Log to FILE (default: /var/log/messages, stdout if -)"
|
2014-07-02 18:51:30 +05:30
|
|
|
//usage: IF_FEATURE_ROTATE_LOGFILE(
|
2017-01-21 08:16:35 +05:30
|
|
|
//usage: "\n -s SIZE Max size (KB) before rotation (default 200KB, 0=off)"
|
|
|
|
//usage: "\n -b N N rotated logs to keep (default 1, max 99, 0=purge)"
|
2014-07-02 18:51:30 +05:30
|
|
|
//usage: )
|
|
|
|
//usage: "\n -l N Log only messages more urgent than prio N (1-8)"
|
|
|
|
//usage: "\n -S Smaller output"
|
2018-08-09 14:55:22 +05:30
|
|
|
//usage: "\n -t Strip client-generated timestamps"
|
2014-07-02 18:51:30 +05:30
|
|
|
//usage: IF_FEATURE_SYSLOGD_DUP(
|
|
|
|
//usage: "\n -D Drop duplicates"
|
|
|
|
//usage: )
|
2011-05-25 15:28:56 +05:30
|
|
|
//usage: IF_FEATURE_SYSLOGD_CFG(
|
|
|
|
//usage: "\n -f FILE Use FILE as config (default:/etc/syslog.conf)"
|
|
|
|
//usage: )
|
2017-01-21 08:16:35 +05:30
|
|
|
/* //usage: "\n -m MIN Minutes between MARK lines (default 20, 0=off)" */
|
2011-04-11 06:59:49 +05:30
|
|
|
//usage:
|
|
|
|
//usage:#define syslogd_example_usage
|
|
|
|
//usage: "$ syslogd -R masterlog:514\n"
|
|
|
|
//usage: "$ syslogd -R 192.168.1.1:601\n"
|
|
|
|
|
2008-06-11 21:13:19 +05:30
|
|
|
/*
|
|
|
|
* Done in syslogd_and_logger.c:
|
2007-05-27 00:30:18 +05:30
|
|
|
#include "libbb.h"
|
2008-01-27 18:20:12 +05:30
|
|
|
#define SYSLOG_NAMES
|
|
|
|
#define SYSLOG_NAMES_CONST
|
|
|
|
#include <syslog.h>
|
2008-06-11 21:13:19 +05:30
|
|
|
*/
|
2013-08-05 05:39:16 +05:30
|
|
|
#ifndef _PATH_LOG
|
|
|
|
#define _PATH_LOG "/dev/log"
|
|
|
|
#endif
|
2008-01-27 18:20:12 +05:30
|
|
|
|
1999-11-24 14:34:33 +05:30
|
|
|
#include <sys/un.h>
|
2000-07-21 05:11:24 +05:30
|
|
|
#include <sys/uio.h>
|
1999-11-25 13:00:46 +05:30
|
|
|
|
2007-03-16 01:20:46 +05:30
|
|
|
#if ENABLE_FEATURE_REMOTE_LOG
|
|
|
|
#include <netinet/in.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if ENABLE_FEATURE_IPC_SYSLOG
|
|
|
|
#include <sys/ipc.h>
|
|
|
|
#include <sys/sem.h>
|
|
|
|
#include <sys/shm.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2007-01-04 23:29:59 +05:30
|
|
|
#define DEBUG 0
|
|
|
|
|
2007-03-21 01:33:03 +05:30
|
|
|
/* MARK code is not very useful, is bloat, and broken:
|
|
|
|
* can deadlock if alarmed to make MARK while writing to IPC buffer
|
|
|
|
* (semaphores are down but do_mark routine tries to down them again) */
|
|
|
|
#undef SYSLOGD_MARK
|
2000-02-09 01:28:47 +05:30
|
|
|
|
2008-12-10 04:23:31 +05:30
|
|
|
/* Write locking does not seem to be useful either */
|
|
|
|
#undef SYSLOGD_WRLOCK
|
|
|
|
|
2008-01-03 17:42:27 +05:30
|
|
|
enum {
|
2010-03-31 19:28:58 +05:30
|
|
|
MAX_READ = CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE,
|
2008-01-03 17:42:27 +05:30
|
|
|
DNS_WAIT_SEC = 2 * 60,
|
|
|
|
};
|
1999-11-24 14:34:33 +05:30
|
|
|
|
2007-03-21 01:33:03 +05:30
|
|
|
/* Semaphore operation structures */
|
|
|
|
struct shbuf_ds {
|
2007-08-13 03:03:06 +05:30
|
|
|
int32_t size; /* size of data - 1 */
|
2007-03-21 01:33:03 +05:30
|
|
|
int32_t tail; /* end of message list */
|
|
|
|
char data[1]; /* data/messages */
|
|
|
|
};
|
2007-01-04 23:29:59 +05:30
|
|
|
|
2010-02-28 17:31:59 +05:30
|
|
|
#if ENABLE_FEATURE_REMOTE_LOG
|
|
|
|
typedef struct {
|
|
|
|
int remoteFD;
|
|
|
|
unsigned last_dns_resolve;
|
|
|
|
len_and_sockaddr *remoteAddr;
|
|
|
|
const char *remoteHostname;
|
|
|
|
} remoteHost_t;
|
|
|
|
#endif
|
|
|
|
|
2011-04-10 11:04:27 +05:30
|
|
|
typedef struct logFile_t {
|
|
|
|
const char *path;
|
|
|
|
int fd;
|
2014-07-03 18:21:47 +05:30
|
|
|
time_t last_log_time;
|
2011-04-10 11:04:27 +05:30
|
|
|
#if ENABLE_FEATURE_ROTATE_LOGFILE
|
|
|
|
unsigned size;
|
|
|
|
uint8_t isRegular;
|
|
|
|
#endif
|
|
|
|
} logFile_t;
|
|
|
|
|
|
|
|
#if ENABLE_FEATURE_SYSLOGD_CFG
|
|
|
|
typedef struct logRule_t {
|
|
|
|
uint8_t enabled_facility_priomap[LOG_NFACILITIES];
|
|
|
|
struct logFile_t *file;
|
|
|
|
struct logRule_t *next;
|
|
|
|
} logRule_t;
|
|
|
|
#endif
|
|
|
|
|
2007-03-21 01:33:03 +05:30
|
|
|
/* Allows us to have smaller initializer. Ugly. */
|
|
|
|
#define GLOBALS \
|
2011-04-10 11:04:27 +05:30
|
|
|
logFile_t logFile; \
|
2007-03-21 01:33:03 +05:30
|
|
|
/* interval between marks in seconds */ \
|
|
|
|
/*int markInterval;*/ \
|
|
|
|
/* level of messages to be logged */ \
|
|
|
|
int logLevel; \
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_FEATURE_ROTATE_LOGFILE( \
|
2007-03-21 01:33:03 +05:30
|
|
|
/* max size of file before rotation */ \
|
|
|
|
unsigned logFileSize; \
|
|
|
|
/* number of rotated message files */ \
|
|
|
|
unsigned logFileRotate; \
|
|
|
|
) \
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_FEATURE_IPC_SYSLOG( \
|
2007-03-21 01:33:03 +05:30
|
|
|
int shmid; /* ipc shared memory id */ \
|
|
|
|
int s_semid; /* ipc semaphore id */ \
|
|
|
|
int shm_size; \
|
|
|
|
struct sembuf SMwup[1]; \
|
|
|
|
struct sembuf SMwdn[3]; \
|
2011-04-10 11:04:27 +05:30
|
|
|
) \
|
|
|
|
IF_FEATURE_SYSLOGD_CFG( \
|
|
|
|
logRule_t *log_rules; \
|
2013-01-06 04:37:19 +05:30
|
|
|
) \
|
|
|
|
IF_FEATURE_KMSG_SYSLOG( \
|
|
|
|
int kmsgfd; \
|
|
|
|
int primask; \
|
2007-03-21 01:33:03 +05:30
|
|
|
)
|
|
|
|
|
|
|
|
struct init_globals {
|
|
|
|
GLOBALS
|
|
|
|
};
|
2007-03-16 01:20:46 +05:30
|
|
|
|
2007-03-21 01:33:03 +05:30
|
|
|
struct globals {
|
|
|
|
GLOBALS
|
2008-01-03 17:42:27 +05:30
|
|
|
|
|
|
|
#if ENABLE_FEATURE_REMOTE_LOG
|
2010-02-28 17:31:59 +05:30
|
|
|
llist_t *remoteHosts;
|
2008-01-03 17:42:27 +05:30
|
|
|
#endif
|
2007-03-16 01:20:46 +05:30
|
|
|
#if ENABLE_FEATURE_IPC_SYSLOG
|
|
|
|
struct shbuf_ds *shbuf;
|
|
|
|
#endif
|
2008-02-26 04:53:58 +05:30
|
|
|
/* localhost's name. We print only first 64 chars */
|
|
|
|
char *hostname;
|
2007-03-16 01:20:46 +05:30
|
|
|
|
2007-03-21 01:33:03 +05:30
|
|
|
/* We recv into recvbuf... */
|
2008-02-27 01:43:52 +05:30
|
|
|
char recvbuf[MAX_READ * (1 + ENABLE_FEATURE_SYSLOGD_DUP)];
|
2007-03-21 01:33:03 +05:30
|
|
|
/* ...then copy to parsebuf, escaping control chars */
|
|
|
|
/* (can grow x2 max) */
|
|
|
|
char parsebuf[MAX_READ*2];
|
|
|
|
/* ...then sprintf into printbuf, adding timestamp (15 chars),
|
|
|
|
* host (64), fac.prio (20) to the message */
|
|
|
|
/* (growth by: 15 + 64 + 20 + delims = ~110) */
|
|
|
|
char printbuf[MAX_READ*2 + 128];
|
|
|
|
};
|
2007-03-16 01:20:46 +05:30
|
|
|
|
2007-03-21 01:33:03 +05:30
|
|
|
static const struct init_globals init_data = {
|
2011-04-10 11:04:27 +05:30
|
|
|
.logFile = {
|
|
|
|
.path = "/var/log/messages",
|
|
|
|
.fd = -1,
|
|
|
|
},
|
2007-03-16 01:20:46 +05:30
|
|
|
#ifdef SYSLOGD_MARK
|
|
|
|
.markInterval = 20 * 60,
|
|
|
|
#endif
|
|
|
|
.logLevel = 8,
|
|
|
|
#if ENABLE_FEATURE_ROTATE_LOGFILE
|
|
|
|
.logFileSize = 200 * 1024,
|
|
|
|
.logFileRotate = 1,
|
|
|
|
#endif
|
|
|
|
#if ENABLE_FEATURE_IPC_SYSLOG
|
|
|
|
.shmid = -1,
|
|
|
|
.s_semid = -1,
|
2011-04-10 11:04:27 +05:30
|
|
|
.shm_size = ((CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE)*1024), /* default shm size */
|
2007-03-16 01:20:46 +05:30
|
|
|
.SMwup = { {1, -1, IPC_NOWAIT} },
|
|
|
|
.SMwdn = { {0, 0}, {1, 0}, {1, +1} },
|
|
|
|
#endif
|
|
|
|
};
|
|
|
|
|
|
|
|
#define G (*ptr_to_globals)
|
2008-01-03 17:42:27 +05:30
|
|
|
#define INIT_G() do { \
|
2008-02-28 00:11:59 +05:30
|
|
|
SET_PTR_TO_GLOBALS(memcpy(xzalloc(sizeof(G)), &init_data, sizeof(init_data))); \
|
2008-01-03 17:42:27 +05:30
|
|
|
} while (0)
|
2007-03-16 01:20:46 +05:30
|
|
|
|
2000-07-21 05:11:24 +05:30
|
|
|
|
2007-01-05 02:52:11 +05:30
|
|
|
/* Options */
|
2006-10-01 00:50:00 +05:30
|
|
|
enum {
|
|
|
|
OPTBIT_mark = 0, // -m
|
|
|
|
OPTBIT_nofork, // -n
|
|
|
|
OPTBIT_outfile, // -O
|
|
|
|
OPTBIT_loglevel, // -l
|
|
|
|
OPTBIT_small, // -S
|
2018-08-09 14:55:22 +05:30
|
|
|
OPTBIT_timestamp, // -t
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_FEATURE_ROTATE_LOGFILE(OPTBIT_filesize ,) // -s
|
|
|
|
IF_FEATURE_ROTATE_LOGFILE(OPTBIT_rotatecnt ,) // -b
|
|
|
|
IF_FEATURE_REMOTE_LOG( OPTBIT_remotelog ,) // -R
|
|
|
|
IF_FEATURE_REMOTE_LOG( OPTBIT_locallog ,) // -L
|
|
|
|
IF_FEATURE_IPC_SYSLOG( OPTBIT_circularlog,) // -C
|
|
|
|
IF_FEATURE_SYSLOGD_DUP( OPTBIT_dup ,) // -D
|
2011-04-10 11:04:27 +05:30
|
|
|
IF_FEATURE_SYSLOGD_CFG( OPTBIT_cfg ,) // -f
|
2013-01-06 04:37:19 +05:30
|
|
|
IF_FEATURE_KMSG_SYSLOG( OPTBIT_kmsg ,) // -K
|
2006-10-01 00:50:00 +05:30
|
|
|
|
|
|
|
OPT_mark = 1 << OPTBIT_mark ,
|
|
|
|
OPT_nofork = 1 << OPTBIT_nofork ,
|
|
|
|
OPT_outfile = 1 << OPTBIT_outfile ,
|
|
|
|
OPT_loglevel = 1 << OPTBIT_loglevel,
|
|
|
|
OPT_small = 1 << OPTBIT_small ,
|
2018-08-09 14:55:22 +05:30
|
|
|
OPT_timestamp = 1 << OPTBIT_timestamp,
|
2009-04-21 16:39:40 +05:30
|
|
|
OPT_filesize = IF_FEATURE_ROTATE_LOGFILE((1 << OPTBIT_filesize )) + 0,
|
|
|
|
OPT_rotatecnt = IF_FEATURE_ROTATE_LOGFILE((1 << OPTBIT_rotatecnt )) + 0,
|
|
|
|
OPT_remotelog = IF_FEATURE_REMOTE_LOG( (1 << OPTBIT_remotelog )) + 0,
|
|
|
|
OPT_locallog = IF_FEATURE_REMOTE_LOG( (1 << OPTBIT_locallog )) + 0,
|
|
|
|
OPT_circularlog = IF_FEATURE_IPC_SYSLOG( (1 << OPTBIT_circularlog)) + 0,
|
|
|
|
OPT_dup = IF_FEATURE_SYSLOGD_DUP( (1 << OPTBIT_dup )) + 0,
|
2011-04-10 11:04:27 +05:30
|
|
|
OPT_cfg = IF_FEATURE_SYSLOGD_CFG( (1 << OPTBIT_cfg )) + 0,
|
2013-01-06 04:37:19 +05:30
|
|
|
OPT_kmsg = IF_FEATURE_KMSG_SYSLOG( (1 << OPTBIT_kmsg )) + 0,
|
2006-10-01 00:50:00 +05:30
|
|
|
};
|
2018-08-09 14:55:22 +05:30
|
|
|
#define OPTION_STR "m:nO:l:St" \
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_FEATURE_ROTATE_LOGFILE("s:" ) \
|
|
|
|
IF_FEATURE_ROTATE_LOGFILE("b:" ) \
|
2016-07-07 01:28:02 +05:30
|
|
|
IF_FEATURE_REMOTE_LOG( "R:*") \
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_FEATURE_REMOTE_LOG( "L" ) \
|
|
|
|
IF_FEATURE_IPC_SYSLOG( "C::") \
|
2011-04-10 11:04:27 +05:30
|
|
|
IF_FEATURE_SYSLOGD_DUP( "D" ) \
|
2013-01-06 04:37:19 +05:30
|
|
|
IF_FEATURE_SYSLOGD_CFG( "f:" ) \
|
|
|
|
IF_FEATURE_KMSG_SYSLOG( "K" )
|
2006-10-01 00:50:00 +05:30
|
|
|
#define OPTION_DECL *opt_m, *opt_l \
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_FEATURE_ROTATE_LOGFILE(,*opt_s) \
|
|
|
|
IF_FEATURE_ROTATE_LOGFILE(,*opt_b) \
|
2011-04-10 11:04:27 +05:30
|
|
|
IF_FEATURE_IPC_SYSLOG( ,*opt_C = NULL) \
|
|
|
|
IF_FEATURE_SYSLOGD_CFG( ,*opt_f = NULL)
|
|
|
|
#define OPTION_PARAM &opt_m, &(G.logFile.path), &opt_l \
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_FEATURE_ROTATE_LOGFILE(,&opt_s) \
|
|
|
|
IF_FEATURE_ROTATE_LOGFILE(,&opt_b) \
|
2013-01-14 06:04:48 +05:30
|
|
|
IF_FEATURE_REMOTE_LOG( ,&remoteAddrList) \
|
2011-04-10 11:04:27 +05:30
|
|
|
IF_FEATURE_IPC_SYSLOG( ,&opt_C) \
|
|
|
|
IF_FEATURE_SYSLOGD_CFG( ,&opt_f)
|
2002-09-18 01:36:29 +05:30
|
|
|
|
|
|
|
|
2011-04-10 11:04:27 +05:30
|
|
|
#if ENABLE_FEATURE_SYSLOGD_CFG
|
|
|
|
static const CODE* find_by_name(char *name, const CODE* c_set)
|
|
|
|
{
|
|
|
|
for (; c_set->c_name; c_set++) {
|
|
|
|
if (strcmp(name, c_set->c_name) == 0)
|
|
|
|
return c_set;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
static const CODE* find_by_val(int val, const CODE* c_set)
|
|
|
|
{
|
|
|
|
for (; c_set->c_name; c_set++) {
|
|
|
|
if (c_set->c_val == val)
|
|
|
|
return c_set;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if ENABLE_FEATURE_SYSLOGD_CFG
|
|
|
|
static void parse_syslogdcfg(const char *file)
|
|
|
|
{
|
|
|
|
char *t;
|
|
|
|
logRule_t **pp_rule;
|
|
|
|
/* tok[0] set of selectors */
|
|
|
|
/* tok[1] file name */
|
|
|
|
/* tok[2] has to be NULL */
|
|
|
|
char *tok[3];
|
|
|
|
parser_t *parser;
|
|
|
|
|
|
|
|
parser = config_open2(file ? file : "/etc/syslog.conf",
|
2011-09-16 16:58:52 +05:30
|
|
|
file ? xfopen_for_read : fopen_for_read);
|
2011-04-10 11:04:27 +05:30
|
|
|
if (!parser)
|
|
|
|
/* didn't find default /etc/syslog.conf */
|
|
|
|
/* proceed as if we built busybox without config support */
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* use ptr to ptr to avoid checking whether head was initialized */
|
|
|
|
pp_rule = &G.log_rules;
|
|
|
|
/* iterate through lines of config, skipping comments */
|
|
|
|
while (config_read(parser, tok, 3, 2, "# \t", PARSE_NORMAL | PARSE_MIN_DIE)) {
|
|
|
|
char *cur_selector;
|
|
|
|
logRule_t *cur_rule;
|
|
|
|
|
|
|
|
/* unexpected trailing token? */
|
2011-04-16 23:45:14 +05:30
|
|
|
if (tok[2])
|
2011-04-10 11:04:27 +05:30
|
|
|
goto cfgerr;
|
|
|
|
|
|
|
|
cur_rule = *pp_rule = xzalloc(sizeof(*cur_rule));
|
|
|
|
|
|
|
|
cur_selector = tok[0];
|
|
|
|
/* iterate through selectors: "kern.info;kern.!err;..." */
|
|
|
|
do {
|
|
|
|
const CODE *code;
|
|
|
|
char *next_selector;
|
|
|
|
uint8_t negated_prio; /* "kern.!err" */
|
|
|
|
uint8_t single_prio; /* "kern.=err" */
|
|
|
|
uint32_t facmap; /* bitmap of enabled facilities */
|
|
|
|
uint8_t primap; /* bitmap of enabled priorities */
|
|
|
|
unsigned i;
|
|
|
|
|
|
|
|
next_selector = strchr(cur_selector, ';');
|
|
|
|
if (next_selector)
|
|
|
|
*next_selector++ = '\0';
|
|
|
|
|
|
|
|
t = strchr(cur_selector, '.');
|
2011-04-16 23:45:14 +05:30
|
|
|
if (!t)
|
2011-04-10 11:04:27 +05:30
|
|
|
goto cfgerr;
|
|
|
|
*t++ = '\0'; /* separate facility from priority */
|
|
|
|
|
|
|
|
negated_prio = 0;
|
|
|
|
single_prio = 0;
|
|
|
|
if (*t == '!') {
|
|
|
|
negated_prio = 1;
|
|
|
|
++t;
|
|
|
|
}
|
|
|
|
if (*t == '=') {
|
|
|
|
single_prio = 1;
|
|
|
|
++t;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* parse priority */
|
|
|
|
if (*t == '*')
|
|
|
|
primap = 0xff; /* all 8 log levels enabled */
|
|
|
|
else {
|
|
|
|
uint8_t priority;
|
2017-08-16 18:35:36 +05:30
|
|
|
code = find_by_name(t, bb_prioritynames);
|
2011-04-10 11:04:27 +05:30
|
|
|
if (!code)
|
|
|
|
goto cfgerr;
|
|
|
|
primap = 0;
|
|
|
|
priority = code->c_val;
|
|
|
|
if (priority == INTERNAL_NOPRI) {
|
|
|
|
/* ensure we take "enabled_facility_priomap[fac] &= 0" branch below */
|
|
|
|
negated_prio = 1;
|
|
|
|
} else {
|
|
|
|
priority = 1 << priority;
|
|
|
|
do {
|
|
|
|
primap |= priority;
|
|
|
|
if (single_prio)
|
|
|
|
break;
|
|
|
|
priority >>= 1;
|
|
|
|
} while (priority);
|
|
|
|
if (negated_prio)
|
|
|
|
primap = ~primap;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* parse facility */
|
|
|
|
if (*cur_selector == '*')
|
|
|
|
facmap = (1<<LOG_NFACILITIES) - 1;
|
|
|
|
else {
|
|
|
|
char *next_facility;
|
|
|
|
facmap = 0;
|
|
|
|
t = cur_selector;
|
|
|
|
/* iterate through facilities: "kern,daemon.<priospec>" */
|
|
|
|
do {
|
|
|
|
next_facility = strchr(t, ',');
|
|
|
|
if (next_facility)
|
|
|
|
*next_facility++ = '\0';
|
2017-08-16 18:35:36 +05:30
|
|
|
code = find_by_name(t, bb_facilitynames);
|
2011-04-10 11:04:27 +05:30
|
|
|
if (!code)
|
|
|
|
goto cfgerr;
|
|
|
|
/* "mark" is not a real facility, skip it */
|
|
|
|
if (code->c_val != INTERNAL_MARK)
|
|
|
|
facmap |= 1<<(LOG_FAC(code->c_val));
|
|
|
|
t = next_facility;
|
|
|
|
} while (t);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* merge result with previous selectors */
|
|
|
|
for (i = 0; i < LOG_NFACILITIES; ++i) {
|
|
|
|
if (!(facmap & (1<<i)))
|
|
|
|
continue;
|
|
|
|
if (negated_prio)
|
|
|
|
cur_rule->enabled_facility_priomap[i] &= primap;
|
|
|
|
else
|
|
|
|
cur_rule->enabled_facility_priomap[i] |= primap;
|
|
|
|
}
|
|
|
|
|
|
|
|
cur_selector = next_selector;
|
|
|
|
} while (cur_selector);
|
|
|
|
|
2011-04-16 23:06:15 +05:30
|
|
|
/* check whether current file name was mentioned in previous rules or
|
|
|
|
* as global logfile (G.logFile).
|
|
|
|
*/
|
|
|
|
if (strcmp(G.logFile.path, tok[1]) == 0) {
|
|
|
|
cur_rule->file = &G.logFile;
|
|
|
|
goto found;
|
|
|
|
}
|
|
|
|
/* temporarily use cur_rule as iterator, but *pp_rule still points
|
|
|
|
* to currently processing rule entry.
|
2011-04-10 11:04:27 +05:30
|
|
|
* NOTE: *pp_rule points to the current (and last in the list) rule.
|
|
|
|
*/
|
|
|
|
for (cur_rule = G.log_rules; cur_rule != *pp_rule; cur_rule = cur_rule->next) {
|
|
|
|
if (strcmp(cur_rule->file->path, tok[1]) == 0) {
|
|
|
|
/* found - reuse the same file structure */
|
|
|
|
(*pp_rule)->file = cur_rule->file;
|
|
|
|
cur_rule = *pp_rule;
|
|
|
|
goto found;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
cur_rule->file = xzalloc(sizeof(*cur_rule->file));
|
|
|
|
cur_rule->file->fd = -1;
|
|
|
|
cur_rule->file->path = xstrdup(tok[1]);
|
|
|
|
found:
|
|
|
|
pp_rule = &cur_rule->next;
|
|
|
|
}
|
|
|
|
config_close(parser);
|
|
|
|
return;
|
|
|
|
|
|
|
|
cfgerr:
|
2013-01-20 20:35:41 +05:30
|
|
|
bb_error_msg_and_die("error in '%s' at line %d",
|
|
|
|
file ? file : "/etc/syslog.conf",
|
|
|
|
parser->lineno);
|
2011-04-10 11:04:27 +05:30
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2001-03-13 04:21:50 +05:30
|
|
|
/* circular buffer variables/structures */
|
2007-01-04 23:27:54 +05:30
|
|
|
#if ENABLE_FEATURE_IPC_SYSLOG
|
|
|
|
|
2003-12-19 17:02:14 +05:30
|
|
|
#if CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE < 4
|
|
|
|
#error Sorry, you must set the syslogd buffer size to at least 4KB.
|
|
|
|
#error Please check CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE
|
|
|
|
#endif
|
|
|
|
|
2008-06-11 21:13:19 +05:30
|
|
|
/* our shared key (syslogd.c and logread.c must be in sync) */
|
|
|
|
enum { KEY_ID = 0x414e4547 }; /* "GENA" */
|
2001-03-13 04:21:50 +05:30
|
|
|
|
2005-09-22 18:29:26 +05:30
|
|
|
static void ipcsyslog_cleanup(void)
|
2002-11-11 04:16:45 +05:30
|
|
|
{
|
2007-03-16 01:20:46 +05:30
|
|
|
if (G.shmid != -1) {
|
|
|
|
shmdt(G.shbuf);
|
2002-11-11 04:16:45 +05:30
|
|
|
}
|
2007-03-16 01:20:46 +05:30
|
|
|
if (G.shmid != -1) {
|
|
|
|
shmctl(G.shmid, IPC_RMID, NULL);
|
2002-11-11 04:16:45 +05:30
|
|
|
}
|
2007-03-16 01:20:46 +05:30
|
|
|
if (G.s_semid != -1) {
|
|
|
|
semctl(G.s_semid, 0, IPC_RMID, 0);
|
2002-11-11 04:16:45 +05:30
|
|
|
}
|
2001-03-13 04:21:50 +05:30
|
|
|
}
|
|
|
|
|
2005-09-22 18:29:26 +05:30
|
|
|
static void ipcsyslog_init(void)
|
2002-11-11 04:16:45 +05:30
|
|
|
{
|
2007-01-04 23:29:59 +05:30
|
|
|
if (DEBUG)
|
2008-06-11 21:13:19 +05:30
|
|
|
printf("shmget(%x, %d,...)\n", (int)KEY_ID, G.shm_size);
|
2007-01-04 23:29:59 +05:30
|
|
|
|
2007-08-14 15:57:56 +05:30
|
|
|
G.shmid = shmget(KEY_ID, G.shm_size, IPC_CREAT | 0644);
|
2007-03-16 01:20:46 +05:30
|
|
|
if (G.shmid == -1) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_perror_msg_and_die("shmget");
|
2007-01-04 23:27:54 +05:30
|
|
|
}
|
2001-03-13 04:21:50 +05:30
|
|
|
|
2007-03-16 01:20:46 +05:30
|
|
|
G.shbuf = shmat(G.shmid, NULL, 0);
|
2008-01-07 21:28:02 +05:30
|
|
|
if (G.shbuf == (void*) -1L) { /* shmat has bizarre error return */
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_perror_msg_and_die("shmat");
|
2007-01-04 23:27:54 +05:30
|
|
|
}
|
2001-03-13 04:21:50 +05:30
|
|
|
|
2007-08-13 03:03:06 +05:30
|
|
|
memset(G.shbuf, 0, G.shm_size);
|
|
|
|
G.shbuf->size = G.shm_size - offsetof(struct shbuf_ds, data) - 1;
|
|
|
|
/*G.shbuf->tail = 0;*/
|
2001-03-13 04:21:50 +05:30
|
|
|
|
2011-04-10 11:04:27 +05:30
|
|
|
/* we'll trust the OS to set initial semval to 0 (let's hope) */
|
2007-03-16 01:20:46 +05:30
|
|
|
G.s_semid = semget(KEY_ID, 2, IPC_CREAT | IPC_EXCL | 1023);
|
|
|
|
if (G.s_semid == -1) {
|
2007-01-04 23:27:54 +05:30
|
|
|
if (errno == EEXIST) {
|
2007-03-16 01:20:46 +05:30
|
|
|
G.s_semid = semget(KEY_ID, 2, 0);
|
|
|
|
if (G.s_semid != -1)
|
2007-01-04 23:27:54 +05:30
|
|
|
return;
|
2002-11-11 04:16:45 +05:30
|
|
|
}
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_perror_msg_and_die("semget");
|
2001-03-13 04:21:50 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-01-05 02:52:11 +05:30
|
|
|
/* Write message to shared mem buffer */
|
2011-04-10 11:04:27 +05:30
|
|
|
static void log_to_shmem(const char *msg)
|
2002-11-11 04:16:45 +05:30
|
|
|
{
|
2007-01-04 23:27:54 +05:30
|
|
|
int old_tail, new_tail;
|
2011-04-10 11:04:27 +05:30
|
|
|
int len;
|
2001-03-13 04:21:50 +05:30
|
|
|
|
2007-03-16 01:20:46 +05:30
|
|
|
if (semop(G.s_semid, G.SMwdn, 3) == -1) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_perror_msg_and_die("SMwdn");
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 23:05:13 +05:30
|
|
|
}
|
2001-03-13 04:21:50 +05:30
|
|
|
|
2007-01-04 23:27:54 +05:30
|
|
|
/* Circular Buffer Algorithm:
|
2001-03-13 04:21:50 +05:30
|
|
|
* --------------------------
|
2007-01-14 02:36:21 +05:30
|
|
|
* tail == position where to store next syslog message.
|
2007-08-13 03:03:06 +05:30
|
|
|
* tail's max value is (shbuf->size - 1)
|
|
|
|
* Last byte of buffer is never used and remains NUL.
|
2001-03-13 04:21:50 +05:30
|
|
|
*/
|
2011-04-10 11:04:27 +05:30
|
|
|
len = strlen(msg) + 1; /* length with NUL included */
|
2007-01-04 23:27:54 +05:30
|
|
|
again:
|
2007-03-16 01:20:46 +05:30
|
|
|
old_tail = G.shbuf->tail;
|
2007-01-04 23:27:54 +05:30
|
|
|
new_tail = old_tail + len;
|
2007-03-16 01:20:46 +05:30
|
|
|
if (new_tail < G.shbuf->size) {
|
2007-01-04 23:27:54 +05:30
|
|
|
/* store message, set new tail */
|
2007-03-16 01:20:46 +05:30
|
|
|
memcpy(G.shbuf->data + old_tail, msg, len);
|
|
|
|
G.shbuf->tail = new_tail;
|
2002-11-11 04:16:45 +05:30
|
|
|
} else {
|
2007-01-04 23:27:54 +05:30
|
|
|
/* k == available buffer space ahead of old tail */
|
2007-08-13 03:03:06 +05:30
|
|
|
int k = G.shbuf->size - old_tail;
|
2007-01-04 23:27:54 +05:30
|
|
|
/* copy what fits to the end of buffer, and repeat */
|
2007-03-16 01:20:46 +05:30
|
|
|
memcpy(G.shbuf->data + old_tail, msg, k);
|
2007-01-04 23:27:54 +05:30
|
|
|
msg += k;
|
|
|
|
len -= k;
|
2007-03-16 01:20:46 +05:30
|
|
|
G.shbuf->tail = 0;
|
2007-01-04 23:27:54 +05:30
|
|
|
goto again;
|
2001-03-13 04:21:50 +05:30
|
|
|
}
|
2007-03-16 01:20:46 +05:30
|
|
|
if (semop(G.s_semid, G.SMwup, 1) == -1) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_perror_msg_and_die("SMwup");
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 23:05:13 +05:30
|
|
|
}
|
2007-01-04 23:29:59 +05:30
|
|
|
if (DEBUG)
|
2007-08-13 03:03:06 +05:30
|
|
|
printf("tail:%d\n", G.shbuf->tail);
|
2001-03-13 04:21:50 +05:30
|
|
|
}
|
2006-08-29 01:46:42 +05:30
|
|
|
#else
|
2013-01-06 17:41:04 +05:30
|
|
|
static void ipcsyslog_cleanup(void) {}
|
|
|
|
static void ipcsyslog_init(void) {}
|
2007-01-04 23:27:54 +05:30
|
|
|
void log_to_shmem(const char *msg);
|
|
|
|
#endif /* FEATURE_IPC_SYSLOG */
|
2000-04-20 00:22:56 +05:30
|
|
|
|
2013-01-06 04:37:19 +05:30
|
|
|
#if ENABLE_FEATURE_KMSG_SYSLOG
|
|
|
|
static void kmsg_init(void)
|
|
|
|
{
|
|
|
|
G.kmsgfd = xopen("/dev/kmsg", O_WRONLY);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* kernel < 3.5 expects single char printk KERN_* priority prefix,
|
|
|
|
* from 3.5 onwards the full syslog facility/priority format is supported
|
|
|
|
*/
|
|
|
|
if (get_linux_version_code() < KERNEL_VERSION(3,5,0))
|
|
|
|
G.primask = LOG_PRIMASK;
|
|
|
|
else
|
|
|
|
G.primask = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void kmsg_cleanup(void)
|
|
|
|
{
|
|
|
|
if (ENABLE_FEATURE_CLEAN_UP)
|
|
|
|
close(G.kmsgfd);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Write message to /dev/kmsg */
|
|
|
|
static void log_to_kmsg(int pri, const char *msg)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* kernel < 3.5 expects single char printk KERN_* priority prefix,
|
|
|
|
* from 3.5 onwards the full syslog facility/priority format is supported
|
|
|
|
*/
|
|
|
|
pri &= G.primask;
|
|
|
|
|
2014-07-02 23:11:41 +05:30
|
|
|
full_write(G.kmsgfd, G.printbuf, sprintf(G.printbuf, "<%d>%s\n", pri, msg));
|
2013-01-06 04:37:19 +05:30
|
|
|
}
|
|
|
|
#else
|
2013-01-06 17:41:04 +05:30
|
|
|
static void kmsg_init(void) {}
|
|
|
|
static void kmsg_cleanup(void) {}
|
|
|
|
static void log_to_kmsg(int pri UNUSED_PARAM, const char *msg UNUSED_PARAM) {}
|
2013-01-06 04:37:19 +05:30
|
|
|
#endif /* FEATURE_KMSG_SYSLOG */
|
|
|
|
|
2007-01-04 23:27:54 +05:30
|
|
|
/* Print a message to the log file. */
|
2011-04-10 11:04:27 +05:30
|
|
|
static void log_locally(time_t now, char *msg, logFile_t *log_file)
|
2007-01-04 23:27:54 +05:30
|
|
|
{
|
2008-12-10 04:23:31 +05:30
|
|
|
#ifdef SYSLOGD_WRLOCK
|
2007-01-04 23:32:32 +05:30
|
|
|
struct flock fl;
|
2008-12-10 04:23:31 +05:30
|
|
|
#endif
|
2007-01-04 23:32:32 +05:30
|
|
|
int len = strlen(msg);
|
2002-11-11 04:16:45 +05:30
|
|
|
|
2014-07-02 18:51:30 +05:30
|
|
|
/* fd can't be 0 (we connect fd 0 to /dev/log socket) */
|
|
|
|
/* fd is 1 if "-O -" is in use */
|
|
|
|
if (log_file->fd > 1) {
|
2014-07-03 18:21:47 +05:30
|
|
|
/* Reopen log files every second. This allows admin
|
|
|
|
* to delete the files and not worry about restarting us.
|
2009-03-02 19:56:28 +05:30
|
|
|
* This costs almost nothing since it happens
|
2014-07-03 18:21:47 +05:30
|
|
|
* _at most_ once a second for each file, and happens
|
|
|
|
* only when each file is actually written.
|
2009-03-02 19:56:28 +05:30
|
|
|
*/
|
2008-01-03 17:43:42 +05:30
|
|
|
if (!now)
|
|
|
|
now = time(NULL);
|
2014-07-03 18:21:47 +05:30
|
|
|
if (log_file->last_log_time != now) {
|
|
|
|
log_file->last_log_time = now;
|
2011-04-10 11:04:27 +05:30
|
|
|
close(log_file->fd);
|
2007-01-04 23:32:32 +05:30
|
|
|
goto reopen;
|
|
|
|
}
|
2014-07-02 18:51:30 +05:30
|
|
|
}
|
|
|
|
else if (log_file->fd == 1) {
|
|
|
|
/* We are logging to stdout: do nothing */
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (LONE_DASH(log_file->path)) {
|
|
|
|
log_file->fd = 1;
|
|
|
|
/* log_file->isRegular = 0; - already is */
|
|
|
|
} else {
|
2007-01-04 23:32:32 +05:30
|
|
|
reopen:
|
2014-07-02 18:51:30 +05:30
|
|
|
log_file->fd = open(log_file->path, O_WRONLY | O_CREAT
|
2009-03-02 19:56:28 +05:30
|
|
|
| O_NOCTTY | O_APPEND | O_NONBLOCK,
|
|
|
|
0666);
|
2014-07-02 18:51:30 +05:30
|
|
|
if (log_file->fd < 0) {
|
|
|
|
/* cannot open logfile? - print to /dev/console then */
|
|
|
|
int fd = device_open(DEV_CONSOLE, O_WRONLY | O_NOCTTY | O_NONBLOCK);
|
|
|
|
if (fd < 0)
|
|
|
|
fd = 2; /* then stderr, dammit */
|
|
|
|
full_write(fd, msg, len);
|
|
|
|
if (fd != 2)
|
|
|
|
close(fd);
|
|
|
|
return;
|
|
|
|
}
|
2007-01-04 23:32:32 +05:30
|
|
|
#if ENABLE_FEATURE_ROTATE_LOGFILE
|
2014-07-02 18:51:30 +05:30
|
|
|
{
|
|
|
|
struct stat statf;
|
|
|
|
log_file->isRegular = (fstat(log_file->fd, &statf) == 0 && S_ISREG(statf.st_mode));
|
|
|
|
/* bug (mostly harmless): can wrap around if file > 4gb */
|
|
|
|
log_file->size = statf.st_size;
|
|
|
|
}
|
2007-01-04 23:32:32 +05:30
|
|
|
#endif
|
2014-07-02 18:51:30 +05:30
|
|
|
}
|
2007-01-04 23:32:32 +05:30
|
|
|
}
|
2007-01-04 23:27:54 +05:30
|
|
|
|
2008-12-10 04:23:31 +05:30
|
|
|
#ifdef SYSLOGD_WRLOCK
|
2007-01-04 23:32:32 +05:30
|
|
|
fl.l_whence = SEEK_SET;
|
|
|
|
fl.l_start = 0;
|
|
|
|
fl.l_len = 1;
|
|
|
|
fl.l_type = F_WRLCK;
|
2011-04-10 11:04:27 +05:30
|
|
|
fcntl(log_file->fd, F_SETLKW, &fl);
|
2008-12-10 04:23:31 +05:30
|
|
|
#endif
|
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
2006-08-20 23:05:13 +05:30
|
|
|
|
2007-01-04 23:27:54 +05:30
|
|
|
#if ENABLE_FEATURE_ROTATE_LOGFILE
|
2011-04-10 11:04:27 +05:30
|
|
|
if (G.logFileSize && log_file->isRegular && log_file->size > G.logFileSize) {
|
2007-03-16 01:20:46 +05:30
|
|
|
if (G.logFileRotate) { /* always 0..99 */
|
2011-04-10 11:04:27 +05:30
|
|
|
int i = strlen(log_file->path) + 3 + 1;
|
2007-01-04 23:32:32 +05:30
|
|
|
char oldFile[i];
|
|
|
|
char newFile[i];
|
2007-03-16 01:20:46 +05:30
|
|
|
i = G.logFileRotate - 1;
|
2007-01-04 23:32:32 +05:30
|
|
|
/* rename: f.8 -> f.9; f.7 -> f.8; ... */
|
|
|
|
while (1) {
|
2011-04-10 11:04:27 +05:30
|
|
|
sprintf(newFile, "%s.%d", log_file->path, i);
|
2007-01-04 23:32:32 +05:30
|
|
|
if (i == 0) break;
|
2011-04-10 11:04:27 +05:30
|
|
|
sprintf(oldFile, "%s.%d", log_file->path, --i);
|
2008-05-25 02:33:53 +05:30
|
|
|
/* ignore errors - file might be missing */
|
|
|
|
rename(oldFile, newFile);
|
2003-10-09 15:13:18 +05:30
|
|
|
}
|
2007-01-04 23:32:32 +05:30
|
|
|
/* newFile == "f.0" now */
|
2011-04-10 11:04:27 +05:30
|
|
|
rename(log_file->path, newFile);
|
2003-10-09 15:13:18 +05:30
|
|
|
}
|
2014-05-20 10:32:18 +05:30
|
|
|
|
2014-05-20 10:32:20 +05:30
|
|
|
/* We may or may not have just renamed the file away;
|
|
|
|
* if we didn't rename because we aren't keeping any backlog,
|
|
|
|
* then it's time to clobber the file. If we did rename it...,
|
|
|
|
* incredibly, if F and F.0 are hardlinks, POSIX _demands_
|
|
|
|
* that rename returns 0 but does not remove F!!!
|
|
|
|
* (hardlinked F/F.0 pair was observed after
|
|
|
|
* power failure during rename()).
|
|
|
|
* So ensure old file is gone in any case:
|
2014-05-20 10:32:18 +05:30
|
|
|
*/
|
2014-05-20 10:32:20 +05:30
|
|
|
unlink(log_file->path);
|
2014-05-20 10:32:19 +05:30
|
|
|
#ifdef SYSLOGD_WRLOCK
|
|
|
|
fl.l_type = F_UNLCK;
|
|
|
|
fcntl(log_file->fd, F_SETLKW, &fl);
|
|
|
|
#endif
|
2014-05-20 10:32:20 +05:30
|
|
|
close(log_file->fd);
|
|
|
|
goto reopen;
|
1999-11-25 13:00:46 +05:30
|
|
|
}
|
2014-07-02 23:11:41 +05:30
|
|
|
/* TODO: what to do on write errors ("disk full")? */
|
|
|
|
len = full_write(log_file->fd, msg, len);
|
|
|
|
if (len > 0)
|
|
|
|
log_file->size += len;
|
|
|
|
#else
|
|
|
|
full_write(log_file->fd, msg, len);
|
2007-01-04 23:32:32 +05:30
|
|
|
#endif
|
2014-07-02 23:11:41 +05:30
|
|
|
|
2008-12-10 04:23:31 +05:30
|
|
|
#ifdef SYSLOGD_WRLOCK
|
2007-01-04 23:32:32 +05:30
|
|
|
fl.l_type = F_UNLCK;
|
2011-04-10 11:04:27 +05:30
|
|
|
fcntl(log_file->fd, F_SETLKW, &fl);
|
2008-12-10 04:23:31 +05:30
|
|
|
#endif
|
1999-11-25 13:00:46 +05:30
|
|
|
}
|
|
|
|
|
2007-01-04 23:27:54 +05:30
|
|
|
static void parse_fac_prio_20(int pri, char *res20)
|
1999-11-25 13:00:46 +05:30
|
|
|
{
|
2007-06-04 23:53:59 +05:30
|
|
|
const CODE *c_pri, *c_fac;
|
2000-02-09 01:28:47 +05:30
|
|
|
|
2017-08-16 18:35:36 +05:30
|
|
|
c_fac = find_by_val(LOG_FAC(pri) << 3, bb_facilitynames);
|
2011-04-10 11:04:27 +05:30
|
|
|
if (c_fac) {
|
2017-08-16 18:35:36 +05:30
|
|
|
c_pri = find_by_val(LOG_PRI(pri), bb_prioritynames);
|
2011-04-10 11:04:27 +05:30
|
|
|
if (c_pri) {
|
|
|
|
snprintf(res20, 20, "%s.%s", c_fac->c_name, c_pri->c_name);
|
|
|
|
return;
|
2002-11-11 04:16:45 +05:30
|
|
|
}
|
2000-02-12 03:25:04 +05:30
|
|
|
}
|
2011-04-10 11:04:27 +05:30
|
|
|
snprintf(res20, 20, "<%d>", pri);
|
2007-01-04 23:27:54 +05:30
|
|
|
}
|
2000-02-09 01:28:47 +05:30
|
|
|
|
2007-01-05 02:52:11 +05:30
|
|
|
/* len parameter is used only for "is there a timestamp?" check.
|
2007-11-06 07:08:46 +05:30
|
|
|
* NB: some callers cheat and supply len==0 when they know
|
|
|
|
* that there is no timestamp, short-circuiting the test. */
|
2007-01-04 23:27:54 +05:30
|
|
|
static void timestamp_and_log(int pri, char *msg, int len)
|
|
|
|
{
|
2018-08-09 14:55:22 +05:30
|
|
|
char *timestamp = NULL;
|
2008-01-03 17:43:42 +05:30
|
|
|
time_t now;
|
2008-01-03 17:42:27 +05:30
|
|
|
|
2009-04-22 08:23:02 +05:30
|
|
|
/* Jan 18 00:11:22 msg... */
|
|
|
|
/* 01234567890123456 */
|
2018-08-09 14:55:22 +05:30
|
|
|
if (len >= 16 && msg[3] == ' ' && msg[6] == ' '
|
|
|
|
&& msg[9] == ':' && msg[12] == ':' && msg[15] == ' '
|
2007-01-04 23:27:54 +05:30
|
|
|
) {
|
2018-08-09 14:55:22 +05:30
|
|
|
if (!(option_mask32 & OPT_timestamp)) {
|
|
|
|
/* use message timestamp */
|
|
|
|
timestamp = msg;
|
|
|
|
now = 0;
|
|
|
|
}
|
|
|
|
msg += 16;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!timestamp) {
|
2000-02-09 01:28:47 +05:30
|
|
|
time(&now);
|
2008-01-03 17:43:42 +05:30
|
|
|
timestamp = ctime(&now) + 4; /* skip day of week */
|
2000-02-09 01:28:47 +05:30
|
|
|
}
|
2018-08-09 14:55:22 +05:30
|
|
|
|
2007-01-04 23:27:54 +05:30
|
|
|
timestamp[15] = '\0';
|
2000-02-09 01:28:47 +05:30
|
|
|
|
2013-01-06 17:41:04 +05:30
|
|
|
if (option_mask32 & OPT_kmsg) {
|
2013-01-06 04:37:19 +05:30
|
|
|
log_to_kmsg(pri, msg);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-01-03 17:42:27 +05:30
|
|
|
if (option_mask32 & OPT_small)
|
|
|
|
sprintf(G.printbuf, "%s %s\n", timestamp, msg);
|
|
|
|
else {
|
|
|
|
char res[20];
|
|
|
|
parse_fac_prio_20(pri, res);
|
2008-02-26 04:53:58 +05:30
|
|
|
sprintf(G.printbuf, "%s %.64s %s %s\n", timestamp, G.hostname, res, msg);
|
2000-12-09 01:22:01 +05:30
|
|
|
}
|
2008-01-03 17:43:42 +05:30
|
|
|
|
|
|
|
/* Log message locally (to file or shared mem) */
|
2011-04-10 11:04:27 +05:30
|
|
|
#if ENABLE_FEATURE_SYSLOGD_CFG
|
|
|
|
{
|
|
|
|
bool match = 0;
|
|
|
|
logRule_t *rule;
|
|
|
|
uint8_t facility = LOG_FAC(pri);
|
|
|
|
uint8_t prio_bit = 1 << LOG_PRI(pri);
|
|
|
|
|
|
|
|
for (rule = G.log_rules; rule; rule = rule->next) {
|
|
|
|
if (rule->enabled_facility_priomap[facility] & prio_bit) {
|
|
|
|
log_locally(now, G.printbuf, rule->file);
|
|
|
|
match = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (match)
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
if (LOG_PRI(pri) < G.logLevel) {
|
|
|
|
#if ENABLE_FEATURE_IPC_SYSLOG
|
|
|
|
if ((option_mask32 & OPT_circularlog) && G.shbuf) {
|
2011-09-16 16:58:52 +05:30
|
|
|
log_to_shmem(G.printbuf);
|
2011-04-10 11:04:27 +05:30
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
log_locally(now, G.printbuf, &G.logFile);
|
|
|
|
}
|
2008-01-03 17:43:42 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
static void timestamp_and_log_internal(const char *msg)
|
|
|
|
{
|
2008-12-10 04:23:31 +05:30
|
|
|
/* -L, or no -R */
|
2008-01-03 17:43:42 +05:30
|
|
|
if (ENABLE_FEATURE_REMOTE_LOG && !(option_mask32 & OPT_locallog))
|
|
|
|
return;
|
|
|
|
timestamp_and_log(LOG_SYSLOG | LOG_INFO, (char*)msg, 0);
|
2007-01-04 23:27:54 +05:30
|
|
|
}
|
2004-09-14 23:42:13 +05:30
|
|
|
|
2008-02-13 14:49:14 +05:30
|
|
|
/* tmpbuf[len] is a NUL byte (set by caller), but there can be other,
|
|
|
|
* embedded NULs. Split messages on each of these NULs, parse prio,
|
|
|
|
* escape control chars and log each locally. */
|
2007-01-04 23:27:54 +05:30
|
|
|
static void split_escape_and_log(char *tmpbuf, int len)
|
|
|
|
{
|
|
|
|
char *p = tmpbuf;
|
|
|
|
|
|
|
|
tmpbuf += len;
|
|
|
|
while (p < tmpbuf) {
|
|
|
|
char c;
|
2007-03-21 01:33:03 +05:30
|
|
|
char *q = G.parsebuf;
|
2007-01-04 23:27:54 +05:30
|
|
|
int pri = (LOG_USER | LOG_NOTICE);
|
|
|
|
|
|
|
|
if (*p == '<') {
|
2007-01-05 02:52:11 +05:30
|
|
|
/* Parse the magic priority number */
|
2007-01-04 23:27:54 +05:30
|
|
|
pri = bb_strtou(p + 1, &p, 10);
|
2007-11-06 07:08:46 +05:30
|
|
|
if (*p == '>')
|
|
|
|
p++;
|
|
|
|
if (pri & ~(LOG_FACMASK | LOG_PRIMASK))
|
2007-01-04 23:27:54 +05:30
|
|
|
pri = (LOG_USER | LOG_NOTICE);
|
2006-10-01 00:47:40 +05:30
|
|
|
}
|
2007-01-04 23:27:54 +05:30
|
|
|
|
|
|
|
while ((c = *p++)) {
|
|
|
|
if (c == '\n')
|
|
|
|
c = ' ';
|
2007-06-21 19:14:53 +05:30
|
|
|
if (!(c & ~0x1f) && c != '\t') {
|
2007-01-04 23:27:54 +05:30
|
|
|
*q++ = '^';
|
|
|
|
c += '@'; /* ^@, ^A, ^B... */
|
|
|
|
}
|
|
|
|
*q++ = c;
|
|
|
|
}
|
|
|
|
*q = '\0';
|
2008-01-03 17:42:27 +05:30
|
|
|
|
2007-01-05 02:52:11 +05:30
|
|
|
/* Now log it */
|
2011-04-10 11:04:27 +05:30
|
|
|
timestamp_and_log(pri, G.parsebuf, q - G.parsebuf);
|
2004-06-22 15:42:59 +05:30
|
|
|
}
|
1999-11-24 14:34:33 +05:30
|
|
|
}
|
|
|
|
|
2007-02-15 02:21:46 +05:30
|
|
|
#ifdef SYSLOGD_MARK
|
2007-01-04 23:27:54 +05:30
|
|
|
static void do_mark(int sig)
|
1999-11-25 13:00:46 +05:30
|
|
|
{
|
2007-03-16 01:20:46 +05:30
|
|
|
if (G.markInterval) {
|
2008-01-03 17:43:42 +05:30
|
|
|
timestamp_and_log_internal("-- MARK --");
|
2007-03-16 01:20:46 +05:30
|
|
|
alarm(G.markInterval);
|
2000-02-09 01:28:47 +05:30
|
|
|
}
|
1999-11-25 13:00:46 +05:30
|
|
|
}
|
2007-02-15 02:21:46 +05:30
|
|
|
#endif
|
1999-11-25 13:00:46 +05:30
|
|
|
|
2007-11-10 06:58:19 +05:30
|
|
|
/* Don't inline: prevent struct sockaddr_un to take up space on stack
|
|
|
|
* permanently */
|
|
|
|
static NOINLINE int create_socket(void)
|
1999-11-25 13:00:46 +05:30
|
|
|
{
|
2000-02-09 01:28:47 +05:30
|
|
|
struct sockaddr_un sunx;
|
2007-09-07 19:23:32 +05:30
|
|
|
int sock_fd;
|
2007-02-11 21:49:28 +05:30
|
|
|
char *dev_log_name;
|
2000-04-19 05:21:51 +05:30
|
|
|
|
2007-11-10 06:58:19 +05:30
|
|
|
memset(&sunx, 0, sizeof(sunx));
|
|
|
|
sunx.sun_family = AF_UNIX;
|
|
|
|
|
|
|
|
/* Unlink old /dev/log or object it points to. */
|
|
|
|
/* (if it exists, bind will fail) */
|
2013-08-05 05:39:16 +05:30
|
|
|
strcpy(sunx.sun_path, _PATH_LOG);
|
|
|
|
dev_log_name = xmalloc_follow_symlinks(_PATH_LOG);
|
2007-11-10 06:58:19 +05:30
|
|
|
if (dev_log_name) {
|
|
|
|
safe_strncpy(sunx.sun_path, dev_log_name, sizeof(sunx.sun_path));
|
|
|
|
free(dev_log_name);
|
|
|
|
}
|
|
|
|
unlink(sunx.sun_path);
|
|
|
|
|
|
|
|
sock_fd = xsocket(AF_UNIX, SOCK_DGRAM, 0);
|
|
|
|
xbind(sock_fd, (struct sockaddr *) &sunx, sizeof(sunx));
|
2013-08-05 05:39:16 +05:30
|
|
|
chmod(_PATH_LOG, 0666);
|
2007-11-10 06:58:19 +05:30
|
|
|
|
|
|
|
return sock_fd;
|
|
|
|
}
|
|
|
|
|
2008-01-03 17:42:27 +05:30
|
|
|
#if ENABLE_FEATURE_REMOTE_LOG
|
2010-02-28 17:31:59 +05:30
|
|
|
static int try_to_resolve_remote(remoteHost_t *rh)
|
2008-01-03 17:42:27 +05:30
|
|
|
{
|
2010-02-28 17:31:59 +05:30
|
|
|
if (!rh->remoteAddr) {
|
2008-01-03 17:42:27 +05:30
|
|
|
unsigned now = monotonic_sec();
|
|
|
|
|
|
|
|
/* Don't resolve name too often - DNS timeouts can be big */
|
2010-02-28 17:31:59 +05:30
|
|
|
if ((now - rh->last_dns_resolve) < DNS_WAIT_SEC)
|
2008-01-03 17:42:27 +05:30
|
|
|
return -1;
|
2010-02-28 17:31:59 +05:30
|
|
|
rh->last_dns_resolve = now;
|
|
|
|
rh->remoteAddr = host2sockaddr(rh->remoteHostname, 514);
|
|
|
|
if (!rh->remoteAddr)
|
2008-01-03 17:42:27 +05:30
|
|
|
return -1;
|
|
|
|
}
|
2010-08-03 07:56:20 +05:30
|
|
|
return xsocket(rh->remoteAddr->u.sa.sa_family, SOCK_DGRAM, 0);
|
2008-01-03 17:42:27 +05:30
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-07-05 14:48:54 +05:30
|
|
|
static void do_syslogd(void) NORETURN;
|
2007-11-10 06:58:19 +05:30
|
|
|
static void do_syslogd(void)
|
|
|
|
{
|
2010-02-28 17:31:59 +05:30
|
|
|
#if ENABLE_FEATURE_REMOTE_LOG
|
|
|
|
llist_t *item;
|
|
|
|
#endif
|
2008-02-27 01:43:52 +05:30
|
|
|
#if ENABLE_FEATURE_SYSLOGD_DUP
|
|
|
|
int last_sz = -1;
|
|
|
|
char *last_buf;
|
|
|
|
char *recvbuf = G.recvbuf;
|
|
|
|
#else
|
|
|
|
#define recvbuf (G.recvbuf)
|
|
|
|
#endif
|
2007-11-10 06:58:19 +05:30
|
|
|
|
2008-12-10 04:23:31 +05:30
|
|
|
/* Set up signal handlers (so that they interrupt read()) */
|
|
|
|
signal_no_SA_RESTART_empty_mask(SIGTERM, record_signo);
|
|
|
|
signal_no_SA_RESTART_empty_mask(SIGINT, record_signo);
|
|
|
|
//signal_no_SA_RESTART_empty_mask(SIGQUIT, record_signo);
|
2002-11-11 04:16:45 +05:30
|
|
|
signal(SIGHUP, SIG_IGN);
|
2007-02-15 02:21:46 +05:30
|
|
|
#ifdef SYSLOGD_MARK
|
2007-01-04 23:27:54 +05:30
|
|
|
signal(SIGALRM, do_mark);
|
2007-03-16 01:20:46 +05:30
|
|
|
alarm(G.markInterval);
|
2007-02-15 02:21:46 +05:30
|
|
|
#endif
|
2014-07-02 18:51:30 +05:30
|
|
|
xmove_fd(create_socket(), STDIN_FILENO);
|
2007-02-11 21:49:28 +05:30
|
|
|
|
2013-01-06 17:41:04 +05:30
|
|
|
if (option_mask32 & OPT_circularlog)
|
2002-11-11 04:16:45 +05:30
|
|
|
ipcsyslog_init();
|
2001-04-06 02:25:17 +05:30
|
|
|
|
2013-01-06 17:41:04 +05:30
|
|
|
if (option_mask32 & OPT_kmsg)
|
2013-01-06 04:37:19 +05:30
|
|
|
kmsg_init();
|
|
|
|
|
2008-01-03 17:43:42 +05:30
|
|
|
timestamp_and_log_internal("syslogd started: BusyBox v" BB_VER);
|
2000-04-04 23:44:25 +05:30
|
|
|
|
2008-12-10 04:23:31 +05:30
|
|
|
while (!bb_got_signal) {
|
2008-05-16 03:00:45 +05:30
|
|
|
ssize_t sz;
|
2008-02-27 01:43:52 +05:30
|
|
|
|
|
|
|
#if ENABLE_FEATURE_SYSLOGD_DUP
|
|
|
|
last_buf = recvbuf;
|
|
|
|
if (recvbuf == G.recvbuf)
|
|
|
|
recvbuf = G.recvbuf + MAX_READ;
|
|
|
|
else
|
|
|
|
recvbuf = G.recvbuf;
|
|
|
|
#endif
|
2007-11-06 07:08:46 +05:30
|
|
|
read_again:
|
2014-07-02 18:51:30 +05:30
|
|
|
sz = read(STDIN_FILENO, recvbuf, MAX_READ - 1);
|
2008-12-10 04:23:31 +05:30
|
|
|
if (sz < 0) {
|
|
|
|
if (!bb_got_signal)
|
2013-08-05 05:39:16 +05:30
|
|
|
bb_perror_msg("read from %s", _PATH_LOG);
|
2008-12-10 04:23:31 +05:30
|
|
|
break;
|
|
|
|
}
|
2000-04-04 23:44:25 +05:30
|
|
|
|
2008-02-13 14:49:14 +05:30
|
|
|
/* Drop trailing '\n' and NULs (typically there is one NUL) */
|
2007-11-06 07:08:46 +05:30
|
|
|
while (1) {
|
|
|
|
if (sz == 0)
|
|
|
|
goto read_again;
|
2007-11-06 17:04:03 +05:30
|
|
|
/* man 3 syslog says: "A trailing newline is added when needed".
|
|
|
|
* However, neither glibc nor uclibc do this:
|
|
|
|
* syslog(prio, "test") sends "test\0" to /dev/log,
|
2008-02-13 14:49:14 +05:30
|
|
|
* syslog(prio, "test\n") sends "test\n\0".
|
2007-11-06 17:04:03 +05:30
|
|
|
* IOW: newline is passed verbatim!
|
|
|
|
* I take it to mean that it's syslogd's job
|
2008-02-13 14:49:14 +05:30
|
|
|
* to make those look identical in the log files. */
|
2008-02-27 01:43:52 +05:30
|
|
|
if (recvbuf[sz-1] != '\0' && recvbuf[sz-1] != '\n')
|
2007-11-06 07:08:46 +05:30
|
|
|
break;
|
|
|
|
sz--;
|
|
|
|
}
|
2008-02-27 01:43:52 +05:30
|
|
|
#if ENABLE_FEATURE_SYSLOGD_DUP
|
|
|
|
if ((option_mask32 & OPT_dup) && (sz == last_sz))
|
|
|
|
if (memcmp(last_buf, recvbuf, sz) == 0)
|
|
|
|
continue;
|
|
|
|
last_sz = sz;
|
|
|
|
#endif
|
2007-01-04 23:27:54 +05:30
|
|
|
#if ENABLE_FEATURE_REMOTE_LOG
|
2010-02-28 17:31:59 +05:30
|
|
|
/* Stock syslogd sends it '\n'-terminated
|
|
|
|
* over network, mimic that */
|
|
|
|
recvbuf[sz] = '\n';
|
|
|
|
|
2007-09-07 19:23:32 +05:30
|
|
|
/* We are not modifying log messages in any way before send */
|
|
|
|
/* Remote site cannot trust _us_ anyway and need to do validation again */
|
2010-02-28 17:31:59 +05:30
|
|
|
for (item = G.remoteHosts; item != NULL; item = item->link) {
|
|
|
|
remoteHost_t *rh = (remoteHost_t *)item->data;
|
|
|
|
|
|
|
|
if (rh->remoteFD == -1) {
|
|
|
|
rh->remoteFD = try_to_resolve_remote(rh);
|
|
|
|
if (rh->remoteFD == -1)
|
|
|
|
continue;
|
2002-11-11 04:16:45 +05:30
|
|
|
}
|
2010-08-03 07:56:20 +05:30
|
|
|
|
|
|
|
/* Send message to remote logger.
|
|
|
|
* On some errors, close and set remoteFD to -1
|
|
|
|
* so that DNS resolution is retried.
|
|
|
|
*/
|
|
|
|
if (sendto(rh->remoteFD, recvbuf, sz+1,
|
|
|
|
MSG_DONTWAIT | MSG_NOSIGNAL,
|
|
|
|
&(rh->remoteAddr->u.sa), rh->remoteAddr->len) == -1
|
|
|
|
) {
|
|
|
|
switch (errno) {
|
|
|
|
case ECONNRESET:
|
|
|
|
case ENOTCONN: /* paranoia */
|
|
|
|
case EPIPE:
|
|
|
|
close(rh->remoteFD);
|
|
|
|
rh->remoteFD = -1;
|
|
|
|
free(rh->remoteAddr);
|
|
|
|
rh->remoteAddr = NULL;
|
|
|
|
}
|
|
|
|
}
|
2007-09-07 19:13:28 +05:30
|
|
|
}
|
2007-09-07 19:23:32 +05:30
|
|
|
#endif
|
2008-02-13 14:49:14 +05:30
|
|
|
if (!ENABLE_FEATURE_REMOTE_LOG || (option_mask32 & OPT_locallog)) {
|
2008-02-27 01:43:52 +05:30
|
|
|
recvbuf[sz] = '\0'; /* ensure it *is* NUL terminated */
|
|
|
|
split_escape_and_log(recvbuf, sz);
|
2008-02-13 14:49:14 +05:30
|
|
|
}
|
2008-12-10 04:23:31 +05:30
|
|
|
} /* while (!bb_got_signal) */
|
|
|
|
|
|
|
|
timestamp_and_log_internal("syslogd exiting");
|
2019-03-18 00:17:52 +05:30
|
|
|
remove_pidfile_std_path_and_ext("syslogd");
|
2013-01-06 17:41:04 +05:30
|
|
|
ipcsyslog_cleanup();
|
|
|
|
if (option_mask32 & OPT_kmsg)
|
2013-01-06 04:37:19 +05:30
|
|
|
kmsg_cleanup();
|
2008-12-10 04:23:31 +05:30
|
|
|
kill_myself_with_sig(bb_got_signal);
|
2008-06-11 21:13:19 +05:30
|
|
|
#undef recvbuf
|
1999-11-24 14:34:33 +05:30
|
|
|
}
|
|
|
|
|
2007-10-11 15:35:36 +05:30
|
|
|
int syslogd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
2008-07-05 14:48:54 +05:30
|
|
|
int syslogd_main(int argc UNUSED_PARAM, char **argv)
|
1999-11-25 13:00:46 +05:30
|
|
|
{
|
2008-12-10 04:23:31 +05:30
|
|
|
int opts;
|
2010-02-28 17:31:59 +05:30
|
|
|
char OPTION_DECL;
|
|
|
|
#if ENABLE_FEATURE_REMOTE_LOG
|
|
|
|
llist_t *remoteAddrList = NULL;
|
|
|
|
#endif
|
2000-02-09 01:28:47 +05:30
|
|
|
|
2008-01-03 17:42:27 +05:30
|
|
|
INIT_G();
|
2010-02-28 17:31:59 +05:30
|
|
|
|
2016-07-07 01:28:02 +05:30
|
|
|
/* No non-option params */
|
2017-08-09 01:25:02 +05:30
|
|
|
opts = getopt32(argv, "^"OPTION_STR"\0""=0", OPTION_PARAM);
|
2008-01-03 17:42:27 +05:30
|
|
|
#if ENABLE_FEATURE_REMOTE_LOG
|
2010-02-28 17:31:59 +05:30
|
|
|
while (remoteAddrList) {
|
|
|
|
remoteHost_t *rh = xzalloc(sizeof(*rh));
|
|
|
|
rh->remoteHostname = llist_pop(&remoteAddrList);
|
|
|
|
rh->remoteFD = -1;
|
|
|
|
rh->last_dns_resolve = monotonic_sec() - DNS_WAIT_SEC - 1;
|
|
|
|
llist_add_to(&G.remoteHosts, rh);
|
|
|
|
}
|
2008-01-03 17:42:27 +05:30
|
|
|
#endif
|
2007-03-16 01:20:46 +05:30
|
|
|
|
2007-02-15 02:21:46 +05:30
|
|
|
#ifdef SYSLOGD_MARK
|
2008-12-10 04:23:31 +05:30
|
|
|
if (opts & OPT_mark) // -m
|
2007-03-16 01:20:46 +05:30
|
|
|
G.markInterval = xatou_range(opt_m, 0, INT_MAX/60) * 60;
|
2007-02-15 02:21:46 +05:30
|
|
|
#endif
|
2008-12-10 04:23:31 +05:30
|
|
|
//if (opts & OPT_nofork) // -n
|
|
|
|
//if (opts & OPT_outfile) // -O
|
|
|
|
if (opts & OPT_loglevel) // -l
|
2007-03-16 01:20:46 +05:30
|
|
|
G.logLevel = xatou_range(opt_l, 1, 8);
|
2008-12-10 04:23:31 +05:30
|
|
|
//if (opts & OPT_small) // -S
|
2006-10-01 00:50:00 +05:30
|
|
|
#if ENABLE_FEATURE_ROTATE_LOGFILE
|
2008-12-10 04:23:31 +05:30
|
|
|
if (opts & OPT_filesize) // -s
|
2007-03-16 01:20:46 +05:30
|
|
|
G.logFileSize = xatou_range(opt_s, 0, INT_MAX/1024) * 1024;
|
2008-12-10 04:23:31 +05:30
|
|
|
if (opts & OPT_rotatecnt) // -b
|
2007-03-16 01:20:46 +05:30
|
|
|
G.logFileRotate = xatou_range(opt_b, 0, 99);
|
2001-03-13 04:21:50 +05:30
|
|
|
#endif
|
2006-10-01 00:50:00 +05:30
|
|
|
#if ENABLE_FEATURE_IPC_SYSLOG
|
2007-01-25 03:32:01 +05:30
|
|
|
if (opt_C) // -Cn
|
2007-03-16 01:20:46 +05:30
|
|
|
G.shm_size = xatoul_range(opt_C, 4, INT_MAX/1024) * 1024;
|
2006-10-01 00:50:00 +05:30
|
|
|
#endif
|
2000-12-12 00:58:29 +05:30
|
|
|
/* If they have not specified remote logging, then log locally */
|
2008-12-10 04:23:31 +05:30
|
|
|
if (ENABLE_FEATURE_REMOTE_LOG && !(opts & OPT_remotelog)) // -R
|
2006-10-06 15:19:47 +05:30
|
|
|
option_mask32 |= OPT_locallog;
|
2011-04-10 11:04:27 +05:30
|
|
|
#if ENABLE_FEATURE_SYSLOGD_CFG
|
|
|
|
parse_syslogdcfg(opt_f);
|
|
|
|
#endif
|
2001-03-13 04:21:50 +05:30
|
|
|
|
2000-02-09 01:28:47 +05:30
|
|
|
/* Store away localhost's name before the fork */
|
2008-02-26 04:53:58 +05:30
|
|
|
G.hostname = safe_gethostname();
|
|
|
|
*strchrnul(G.hostname, '.') = '\0';
|
2000-02-09 01:28:47 +05:30
|
|
|
|
2008-12-10 04:23:31 +05:30
|
|
|
if (!(opts & OPT_nofork)) {
|
2007-03-26 18:50:54 +05:30
|
|
|
bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
|
2003-07-28 13:10:39 +05:30
|
|
|
}
|
2012-12-11 01:19:39 +05:30
|
|
|
|
2010-01-29 21:14:48 +05:30
|
|
|
//umask(0); - why??
|
2019-03-18 00:17:52 +05:30
|
|
|
write_pidfile_std_path_and_ext("syslogd");
|
2012-12-11 01:19:39 +05:30
|
|
|
|
2007-01-04 23:27:54 +05:30
|
|
|
do_syslogd();
|
2007-01-07 03:38:53 +05:30
|
|
|
/* return EXIT_SUCCESS; */
|
1999-11-25 13:00:46 +05:30
|
|
|
}
|
2008-06-11 21:13:19 +05:30
|
|
|
|
|
|
|
/* Clean up. Needed because we are included from syslogd_and_logger.c */
|
2008-12-10 04:23:31 +05:30
|
|
|
#undef DEBUG
|
|
|
|
#undef SYSLOGD_MARK
|
|
|
|
#undef SYSLOGD_WRLOCK
|
2008-06-11 21:13:19 +05:30
|
|
|
#undef G
|
|
|
|
#undef GLOBALS
|
|
|
|
#undef INIT_G
|
|
|
|
#undef OPTION_STR
|
|
|
|
#undef OPTION_DECL
|
|
|
|
#undef OPTION_PARAM
|