2000-02-08 19:58:47 +00:00
|
|
|
/* vi: set sw=4 ts=4: */
|
1999-11-25 07:30:46 +00:00
|
|
|
/*
|
|
|
|
* Mini syslogd implementation for busybox
|
|
|
|
*
|
2004-03-15 08:29:22 +00:00
|
|
|
* Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
|
1999-11-25 07:30:46 +00:00
|
|
|
*
|
2000-04-18 23:51:51 +00:00
|
|
|
* Copyright (C) 2000 by Karl M. Hegbloom <karlheg@debian.org>
|
|
|
|
*
|
2002-12-12 10:54:48 +00:00
|
|
|
* "circular buffer" Copyright (C) 2001 by Gennady Feldman <gfeldman@gena01.com>
|
2001-03-12 22:51:50 +00:00
|
|
|
*
|
2002-12-12 10:54:48 +00:00
|
|
|
* Maintainer: Gennady Feldman <gfeldman@gena01.com> as of Mar 12, 2001
|
2001-03-12 23:41:34 +00:00
|
|
|
*
|
2006-01-22 22:55:11 +00:00
|
|
|
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
|
1999-11-25 07:30:46 +00:00
|
|
|
*/
|
1999-11-24 09:04:33 +00:00
|
|
|
|
2008-06-11 15:43:19 +00:00
|
|
|
/*
|
|
|
|
* Done in syslogd_and_logger.c:
|
2007-05-26 19:00:18 +00:00
|
|
|
#include "libbb.h"
|
2008-01-27 12:50:12 +00:00
|
|
|
#define SYSLOG_NAMES
|
|
|
|
#define SYSLOG_NAMES_CONST
|
|
|
|
#include <syslog.h>
|
2008-06-11 15:43:19 +00:00
|
|
|
*/
|
2008-01-27 12:50:12 +00:00
|
|
|
|
1999-11-24 09:04:33 +00:00
|
|
|
#include <sys/un.h>
|
2000-07-20 23:41:24 +00:00
|
|
|
#include <sys/uio.h>
|
1999-11-25 07:30:46 +00:00
|
|
|
|
2007-03-15 19:50:46 +00:00
|
|
|
#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 17:59:59 +00:00
|
|
|
#define DEBUG 0
|
|
|
|
|
2007-03-20 20:03:03 +00:00
|
|
|
/* 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-08 19:58:47 +00:00
|
|
|
|
2008-12-09 22:53:31 +00:00
|
|
|
/* Write locking does not seem to be useful either */
|
|
|
|
#undef SYSLOGD_WRLOCK
|
|
|
|
|
2008-01-03 12:12:27 +00:00
|
|
|
enum {
|
2010-03-31 13:58:58 +00:00
|
|
|
MAX_READ = CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE,
|
2008-01-03 12:12:27 +00:00
|
|
|
DNS_WAIT_SEC = 2 * 60,
|
|
|
|
};
|
1999-11-24 09:04:33 +00:00
|
|
|
|
2007-03-20 20:03:03 +00:00
|
|
|
/* Semaphore operation structures */
|
|
|
|
struct shbuf_ds {
|
2007-08-12 21:33:06 +00:00
|
|
|
int32_t size; /* size of data - 1 */
|
2007-03-20 20:03:03 +00:00
|
|
|
int32_t tail; /* end of message list */
|
|
|
|
char data[1]; /* data/messages */
|
|
|
|
};
|
2007-01-04 17:59:59 +00:00
|
|
|
|
2010-02-28 12:01:59 +00:00
|
|
|
#if ENABLE_FEATURE_REMOTE_LOG
|
|
|
|
typedef struct {
|
|
|
|
int remoteFD;
|
|
|
|
unsigned last_dns_resolve;
|
|
|
|
len_and_sockaddr *remoteAddr;
|
|
|
|
const char *remoteHostname;
|
|
|
|
} remoteHost_t;
|
|
|
|
#endif
|
|
|
|
|
2007-03-20 20:03:03 +00:00
|
|
|
/* Allows us to have smaller initializer. Ugly. */
|
|
|
|
#define GLOBALS \
|
|
|
|
const char *logFilePath; \
|
|
|
|
int logFD; \
|
|
|
|
/* interval between marks in seconds */ \
|
|
|
|
/*int markInterval;*/ \
|
|
|
|
/* level of messages to be logged */ \
|
|
|
|
int logLevel; \
|
2009-04-21 11:09:40 +00:00
|
|
|
IF_FEATURE_ROTATE_LOGFILE( \
|
2007-03-20 20:03:03 +00:00
|
|
|
/* max size of file before rotation */ \
|
|
|
|
unsigned logFileSize; \
|
|
|
|
/* number of rotated message files */ \
|
|
|
|
unsigned logFileRotate; \
|
|
|
|
unsigned curFileSize; \
|
|
|
|
smallint isRegular; \
|
|
|
|
) \
|
2009-04-21 11:09:40 +00:00
|
|
|
IF_FEATURE_IPC_SYSLOG( \
|
2007-03-20 20:03:03 +00:00
|
|
|
int shmid; /* ipc shared memory id */ \
|
|
|
|
int s_semid; /* ipc semaphore id */ \
|
|
|
|
int shm_size; \
|
|
|
|
struct sembuf SMwup[1]; \
|
|
|
|
struct sembuf SMwdn[3]; \
|
|
|
|
)
|
|
|
|
|
|
|
|
struct init_globals {
|
|
|
|
GLOBALS
|
|
|
|
};
|
2007-03-15 19:50:46 +00:00
|
|
|
|
2007-03-20 20:03:03 +00:00
|
|
|
struct globals {
|
|
|
|
GLOBALS
|
2008-01-03 12:12:27 +00:00
|
|
|
|
|
|
|
#if ENABLE_FEATURE_REMOTE_LOG
|
2010-02-28 12:01:59 +00:00
|
|
|
llist_t *remoteHosts;
|
2008-01-03 12:12:27 +00:00
|
|
|
#endif
|
2007-03-15 19:50:46 +00:00
|
|
|
#if ENABLE_FEATURE_IPC_SYSLOG
|
|
|
|
struct shbuf_ds *shbuf;
|
|
|
|
#endif
|
|
|
|
time_t last_log_time;
|
2008-02-25 23:23:58 +00:00
|
|
|
/* localhost's name. We print only first 64 chars */
|
|
|
|
char *hostname;
|
2007-03-15 19:50:46 +00:00
|
|
|
|
2007-03-20 20:03:03 +00:00
|
|
|
/* We recv into recvbuf... */
|
2008-02-26 20:13:52 +00:00
|
|
|
char recvbuf[MAX_READ * (1 + ENABLE_FEATURE_SYSLOGD_DUP)];
|
2007-03-20 20:03:03 +00:00
|
|
|
/* ...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-15 19:50:46 +00:00
|
|
|
|
2007-03-20 20:03:03 +00:00
|
|
|
static const struct init_globals init_data = {
|
2007-03-15 19:50:46 +00:00
|
|
|
.logFilePath = "/var/log/messages",
|
|
|
|
.logFD = -1,
|
|
|
|
#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,
|
|
|
|
.shm_size = ((CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE)*1024), // default shm size
|
|
|
|
.SMwup = { {1, -1, IPC_NOWAIT} },
|
|
|
|
.SMwdn = { {0, 0}, {1, 0}, {1, +1} },
|
|
|
|
#endif
|
|
|
|
};
|
|
|
|
|
|
|
|
#define G (*ptr_to_globals)
|
2008-01-03 12:12:27 +00:00
|
|
|
#define INIT_G() do { \
|
2008-02-27 18:41:59 +00:00
|
|
|
SET_PTR_TO_GLOBALS(memcpy(xzalloc(sizeof(G)), &init_data, sizeof(init_data))); \
|
2008-01-03 12:12:27 +00:00
|
|
|
} while (0)
|
2007-03-15 19:50:46 +00:00
|
|
|
|
2000-07-20 23:41:24 +00:00
|
|
|
|
2007-01-04 21:22:11 +00:00
|
|
|
/* Options */
|
2006-09-30 19:20:00 +00:00
|
|
|
enum {
|
|
|
|
OPTBIT_mark = 0, // -m
|
|
|
|
OPTBIT_nofork, // -n
|
|
|
|
OPTBIT_outfile, // -O
|
|
|
|
OPTBIT_loglevel, // -l
|
|
|
|
OPTBIT_small, // -S
|
2009-04-21 11:09:40 +00:00
|
|
|
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
|
2006-09-30 19:20:00 +00:00
|
|
|
|
|
|
|
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 ,
|
2009-04-21 11:09:40 +00:00
|
|
|
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,
|
2006-09-30 19:20:00 +00:00
|
|
|
};
|
|
|
|
#define OPTION_STR "m:nO:l:S" \
|
2009-04-21 11:09:40 +00:00
|
|
|
IF_FEATURE_ROTATE_LOGFILE("s:" ) \
|
|
|
|
IF_FEATURE_ROTATE_LOGFILE("b:" ) \
|
|
|
|
IF_FEATURE_REMOTE_LOG( "R:" ) \
|
|
|
|
IF_FEATURE_REMOTE_LOG( "L" ) \
|
|
|
|
IF_FEATURE_IPC_SYSLOG( "C::") \
|
|
|
|
IF_FEATURE_SYSLOGD_DUP( "D" )
|
2006-09-30 19:20:00 +00:00
|
|
|
#define OPTION_DECL *opt_m, *opt_l \
|
2009-04-21 11:09:40 +00:00
|
|
|
IF_FEATURE_ROTATE_LOGFILE(,*opt_s) \
|
|
|
|
IF_FEATURE_ROTATE_LOGFILE(,*opt_b) \
|
|
|
|
IF_FEATURE_IPC_SYSLOG( ,*opt_C = NULL)
|
2007-03-15 19:50:46 +00:00
|
|
|
#define OPTION_PARAM &opt_m, &G.logFilePath, &opt_l \
|
2009-04-21 11:09:40 +00:00
|
|
|
IF_FEATURE_ROTATE_LOGFILE(,&opt_s) \
|
|
|
|
IF_FEATURE_ROTATE_LOGFILE(,&opt_b) \
|
2010-02-28 12:01:59 +00:00
|
|
|
IF_FEATURE_REMOTE_LOG( ,&remoteAddrList) \
|
2009-04-21 11:09:40 +00:00
|
|
|
IF_FEATURE_IPC_SYSLOG( ,&opt_C)
|
2002-09-17 20:06:29 +00:00
|
|
|
|
|
|
|
|
2001-03-12 22:51:50 +00:00
|
|
|
/* circular buffer variables/structures */
|
2007-01-04 17:57:54 +00:00
|
|
|
#if ENABLE_FEATURE_IPC_SYSLOG
|
|
|
|
|
2003-12-19 11:32:14 +00:00
|
|
|
#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 15:43:19 +00:00
|
|
|
/* our shared key (syslogd.c and logread.c must be in sync) */
|
|
|
|
enum { KEY_ID = 0x414e4547 }; /* "GENA" */
|
2001-03-12 22:51:50 +00:00
|
|
|
|
2005-09-22 12:59:26 +00:00
|
|
|
static void ipcsyslog_cleanup(void)
|
2002-11-10 22:46:45 +00:00
|
|
|
{
|
2007-03-15 19:50:46 +00:00
|
|
|
if (G.shmid != -1) {
|
|
|
|
shmdt(G.shbuf);
|
2002-11-10 22:46:45 +00:00
|
|
|
}
|
2007-03-15 19:50:46 +00:00
|
|
|
if (G.shmid != -1) {
|
|
|
|
shmctl(G.shmid, IPC_RMID, NULL);
|
2002-11-10 22:46:45 +00:00
|
|
|
}
|
2007-03-15 19:50:46 +00:00
|
|
|
if (G.s_semid != -1) {
|
|
|
|
semctl(G.s_semid, 0, IPC_RMID, 0);
|
2002-11-10 22:46:45 +00:00
|
|
|
}
|
2001-03-12 22:51:50 +00:00
|
|
|
}
|
|
|
|
|
2005-09-22 12:59:26 +00:00
|
|
|
static void ipcsyslog_init(void)
|
2002-11-10 22:46:45 +00:00
|
|
|
{
|
2007-01-04 17:59:59 +00:00
|
|
|
if (DEBUG)
|
2008-06-11 15:43:19 +00:00
|
|
|
printf("shmget(%x, %d,...)\n", (int)KEY_ID, G.shm_size);
|
2007-01-04 17:59:59 +00:00
|
|
|
|
2007-08-14 10:27:56 +00:00
|
|
|
G.shmid = shmget(KEY_ID, G.shm_size, IPC_CREAT | 0644);
|
2007-03-15 19:50:46 +00:00
|
|
|
if (G.shmid == -1) {
|
2007-01-04 17:57:54 +00:00
|
|
|
bb_perror_msg_and_die("shmget");
|
|
|
|
}
|
2001-03-12 22:51:50 +00:00
|
|
|
|
2007-03-15 19:50:46 +00:00
|
|
|
G.shbuf = shmat(G.shmid, NULL, 0);
|
2008-01-07 15:58:02 +00:00
|
|
|
if (G.shbuf == (void*) -1L) { /* shmat has bizarre error return */
|
2007-01-04 17:57:54 +00:00
|
|
|
bb_perror_msg_and_die("shmat");
|
|
|
|
}
|
2001-03-12 22:51:50 +00:00
|
|
|
|
2007-08-12 21:33:06 +00:00
|
|
|
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-12 22:51:50 +00:00
|
|
|
|
2007-01-04 17:57:54 +00:00
|
|
|
// we'll trust the OS to set initial semval to 0 (let's hope)
|
2007-03-15 19:50:46 +00:00
|
|
|
G.s_semid = semget(KEY_ID, 2, IPC_CREAT | IPC_EXCL | 1023);
|
|
|
|
if (G.s_semid == -1) {
|
2007-01-04 17:57:54 +00:00
|
|
|
if (errno == EEXIST) {
|
2007-03-15 19:50:46 +00:00
|
|
|
G.s_semid = semget(KEY_ID, 2, 0);
|
|
|
|
if (G.s_semid != -1)
|
2007-01-04 17:57:54 +00:00
|
|
|
return;
|
2002-11-10 22:46:45 +00:00
|
|
|
}
|
2007-01-04 17:57:54 +00:00
|
|
|
bb_perror_msg_and_die("semget");
|
2001-03-12 22:51:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-01-04 21:22:11 +00:00
|
|
|
/* Write message to shared mem buffer */
|
2007-01-04 17:57:54 +00:00
|
|
|
static void log_to_shmem(const char *msg, int len)
|
2002-11-10 22:46:45 +00:00
|
|
|
{
|
2007-01-04 17:57:54 +00:00
|
|
|
int old_tail, new_tail;
|
2001-03-12 22:51:50 +00:00
|
|
|
|
2007-03-15 19:50:46 +00:00
|
|
|
if (semop(G.s_semid, G.SMwdn, 3) == -1) {
|
- 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 17:35:13 +00:00
|
|
|
bb_perror_msg_and_die("SMwdn");
|
|
|
|
}
|
2001-03-12 22:51:50 +00:00
|
|
|
|
2007-01-04 17:57:54 +00:00
|
|
|
/* Circular Buffer Algorithm:
|
2001-03-12 22:51:50 +00:00
|
|
|
* --------------------------
|
2007-01-13 21:06:21 +00:00
|
|
|
* tail == position where to store next syslog message.
|
2007-08-12 21:33:06 +00:00
|
|
|
* tail's max value is (shbuf->size - 1)
|
|
|
|
* Last byte of buffer is never used and remains NUL.
|
2001-03-12 22:51:50 +00:00
|
|
|
*/
|
2007-01-04 17:57:54 +00:00
|
|
|
len++; /* length with NUL included */
|
|
|
|
again:
|
2007-03-15 19:50:46 +00:00
|
|
|
old_tail = G.shbuf->tail;
|
2007-01-04 17:57:54 +00:00
|
|
|
new_tail = old_tail + len;
|
2007-03-15 19:50:46 +00:00
|
|
|
if (new_tail < G.shbuf->size) {
|
2007-01-04 17:57:54 +00:00
|
|
|
/* store message, set new tail */
|
2007-03-15 19:50:46 +00:00
|
|
|
memcpy(G.shbuf->data + old_tail, msg, len);
|
|
|
|
G.shbuf->tail = new_tail;
|
2002-11-10 22:46:45 +00:00
|
|
|
} else {
|
2007-01-04 17:57:54 +00:00
|
|
|
/* k == available buffer space ahead of old tail */
|
2007-08-12 21:33:06 +00:00
|
|
|
int k = G.shbuf->size - old_tail;
|
2007-01-04 17:57:54 +00:00
|
|
|
/* copy what fits to the end of buffer, and repeat */
|
2007-03-15 19:50:46 +00:00
|
|
|
memcpy(G.shbuf->data + old_tail, msg, k);
|
2007-01-04 17:57:54 +00:00
|
|
|
msg += k;
|
|
|
|
len -= k;
|
2007-03-15 19:50:46 +00:00
|
|
|
G.shbuf->tail = 0;
|
2007-01-04 17:57:54 +00:00
|
|
|
goto again;
|
2001-03-12 22:51:50 +00:00
|
|
|
}
|
2007-03-15 19:50:46 +00:00
|
|
|
if (semop(G.s_semid, G.SMwup, 1) == -1) {
|
- 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 17:35:13 +00:00
|
|
|
bb_perror_msg_and_die("SMwup");
|
|
|
|
}
|
2007-01-04 17:59:59 +00:00
|
|
|
if (DEBUG)
|
2007-08-12 21:33:06 +00:00
|
|
|
printf("tail:%d\n", G.shbuf->tail);
|
2001-03-12 22:51:50 +00:00
|
|
|
}
|
2006-08-28 20:16:42 +00:00
|
|
|
#else
|
|
|
|
void ipcsyslog_cleanup(void);
|
|
|
|
void ipcsyslog_init(void);
|
2007-01-04 17:57:54 +00:00
|
|
|
void log_to_shmem(const char *msg);
|
|
|
|
#endif /* FEATURE_IPC_SYSLOG */
|
2000-04-19 18:52:56 +00:00
|
|
|
|
2002-11-10 22:46:45 +00:00
|
|
|
|
2007-01-04 17:57:54 +00:00
|
|
|
/* Print a message to the log file. */
|
2008-01-03 12:13:42 +00:00
|
|
|
static void log_locally(time_t now, char *msg)
|
2007-01-04 17:57:54 +00:00
|
|
|
{
|
2008-12-09 22:53:31 +00:00
|
|
|
#ifdef SYSLOGD_WRLOCK
|
2007-01-04 18:02:32 +00:00
|
|
|
struct flock fl;
|
2008-12-09 22:53:31 +00:00
|
|
|
#endif
|
2007-01-04 18:02:32 +00:00
|
|
|
int len = strlen(msg);
|
2002-11-10 22:46:45 +00:00
|
|
|
|
2007-01-04 17:57:54 +00:00
|
|
|
#if ENABLE_FEATURE_IPC_SYSLOG
|
2007-03-15 19:50:46 +00:00
|
|
|
if ((option_mask32 & OPT_circularlog) && G.shbuf) {
|
2007-01-04 17:57:54 +00:00
|
|
|
log_to_shmem(msg, len);
|
|
|
|
return;
|
|
|
|
}
|
2001-03-12 22:51:50 +00:00
|
|
|
#endif
|
2007-03-15 19:50:46 +00:00
|
|
|
if (G.logFD >= 0) {
|
2009-03-02 14:26:28 +00:00
|
|
|
/* Reopen log file every second. This allows admin
|
|
|
|
* to delete the file and not worry about restarting us.
|
|
|
|
* This costs almost nothing since it happens
|
|
|
|
* _at most_ once a second.
|
|
|
|
*/
|
2008-01-03 12:13:42 +00:00
|
|
|
if (!now)
|
|
|
|
now = time(NULL);
|
|
|
|
if (G.last_log_time != now) {
|
2009-03-02 14:26:28 +00:00
|
|
|
G.last_log_time = now;
|
2007-03-15 19:50:46 +00:00
|
|
|
close(G.logFD);
|
2007-01-04 18:02:32 +00:00
|
|
|
goto reopen;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
reopen:
|
2009-03-02 14:26:28 +00:00
|
|
|
G.logFD = open(G.logFilePath, O_WRONLY | O_CREAT
|
|
|
|
| O_NOCTTY | O_APPEND | O_NONBLOCK,
|
|
|
|
0666);
|
2007-03-15 19:50:46 +00:00
|
|
|
if (G.logFD < 0) {
|
2007-01-04 18:02:32 +00:00
|
|
|
/* cannot open logfile? - print to /dev/console then */
|
2007-11-18 05:43:05 +00:00
|
|
|
int fd = device_open(DEV_CONSOLE, O_WRONLY | O_NOCTTY | O_NONBLOCK);
|
2007-01-04 18:02:32 +00:00
|
|
|
if (fd < 0)
|
|
|
|
fd = 2; /* then stderr, dammit */
|
|
|
|
full_write(fd, msg, len);
|
|
|
|
if (fd != 2)
|
|
|
|
close(fd);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#if ENABLE_FEATURE_ROTATE_LOGFILE
|
2007-01-09 23:42:43 +00:00
|
|
|
{
|
2007-08-12 21:33:06 +00:00
|
|
|
struct stat statf;
|
|
|
|
G.isRegular = (fstat(G.logFD, &statf) == 0 && S_ISREG(statf.st_mode));
|
|
|
|
/* bug (mostly harmless): can wrap around if file > 4gb */
|
|
|
|
G.curFileSize = statf.st_size;
|
2007-01-09 23:42:43 +00:00
|
|
|
}
|
2007-01-04 18:02:32 +00:00
|
|
|
#endif
|
|
|
|
}
|
2007-01-04 17:57:54 +00:00
|
|
|
|
2008-12-09 22:53:31 +00:00
|
|
|
#ifdef SYSLOGD_WRLOCK
|
2007-01-04 18:02:32 +00:00
|
|
|
fl.l_whence = SEEK_SET;
|
|
|
|
fl.l_start = 0;
|
|
|
|
fl.l_len = 1;
|
|
|
|
fl.l_type = F_WRLCK;
|
2007-03-15 19:50:46 +00:00
|
|
|
fcntl(G.logFD, F_SETLKW, &fl);
|
2008-12-09 22:53:31 +00:00
|
|
|
#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 17:35:13 +00:00
|
|
|
|
2007-01-04 17:57:54 +00:00
|
|
|
#if ENABLE_FEATURE_ROTATE_LOGFILE
|
2007-03-15 19:50:46 +00:00
|
|
|
if (G.logFileSize && G.isRegular && G.curFileSize > G.logFileSize) {
|
|
|
|
if (G.logFileRotate) { /* always 0..99 */
|
|
|
|
int i = strlen(G.logFilePath) + 3 + 1;
|
2007-01-04 18:02:32 +00:00
|
|
|
char oldFile[i];
|
|
|
|
char newFile[i];
|
2007-03-15 19:50:46 +00:00
|
|
|
i = G.logFileRotate - 1;
|
2007-01-04 18:02:32 +00:00
|
|
|
/* rename: f.8 -> f.9; f.7 -> f.8; ... */
|
|
|
|
while (1) {
|
2007-03-15 19:50:46 +00:00
|
|
|
sprintf(newFile, "%s.%d", G.logFilePath, i);
|
2007-01-04 18:02:32 +00:00
|
|
|
if (i == 0) break;
|
2007-03-15 19:50:46 +00:00
|
|
|
sprintf(oldFile, "%s.%d", G.logFilePath, --i);
|
2008-05-24 21:03:53 +00:00
|
|
|
/* ignore errors - file might be missing */
|
|
|
|
rename(oldFile, newFile);
|
2003-10-09 09:43:18 +00:00
|
|
|
}
|
2007-01-04 18:02:32 +00:00
|
|
|
/* newFile == "f.0" now */
|
2008-05-24 21:03:53 +00:00
|
|
|
rename(G.logFilePath, newFile);
|
2008-12-09 22:53:31 +00:00
|
|
|
#ifdef SYSLOGD_WRLOCK
|
2007-01-04 18:02:32 +00:00
|
|
|
fl.l_type = F_UNLCK;
|
2007-03-15 19:50:46 +00:00
|
|
|
fcntl(G.logFD, F_SETLKW, &fl);
|
2008-12-09 22:53:31 +00:00
|
|
|
#endif
|
2007-03-15 19:50:46 +00:00
|
|
|
close(G.logFD);
|
2007-01-04 18:02:32 +00:00
|
|
|
goto reopen;
|
2003-10-09 09:43:18 +00:00
|
|
|
}
|
2007-03-15 19:50:46 +00:00
|
|
|
ftruncate(G.logFD, 0);
|
1999-11-25 07:30:46 +00:00
|
|
|
}
|
2007-03-15 19:50:46 +00:00
|
|
|
G.curFileSize +=
|
2007-01-04 18:02:32 +00:00
|
|
|
#endif
|
2008-10-29 01:19:15 +00:00
|
|
|
full_write(G.logFD, msg, len);
|
2008-12-09 22:53:31 +00:00
|
|
|
#ifdef SYSLOGD_WRLOCK
|
2007-01-04 18:02:32 +00:00
|
|
|
fl.l_type = F_UNLCK;
|
2007-03-15 19:50:46 +00:00
|
|
|
fcntl(G.logFD, F_SETLKW, &fl);
|
2008-12-09 22:53:31 +00:00
|
|
|
#endif
|
1999-11-25 07:30:46 +00:00
|
|
|
}
|
|
|
|
|
2007-01-04 17:57:54 +00:00
|
|
|
static void parse_fac_prio_20(int pri, char *res20)
|
1999-11-25 07:30:46 +00:00
|
|
|
{
|
2007-06-04 18:23:59 +00:00
|
|
|
const CODE *c_pri, *c_fac;
|
2000-02-08 19:58:47 +00:00
|
|
|
|
2000-02-11 21:55:04 +00:00
|
|
|
if (pri != 0) {
|
2006-09-30 19:20:00 +00:00
|
|
|
c_fac = facilitynames;
|
2007-01-04 17:57:54 +00:00
|
|
|
while (c_fac->c_name) {
|
|
|
|
if (c_fac->c_val != (LOG_FAC(pri) << 3)) {
|
2008-02-13 09:19:14 +00:00
|
|
|
c_fac++;
|
|
|
|
continue;
|
2007-01-04 17:57:54 +00:00
|
|
|
}
|
|
|
|
/* facility is found, look for prio */
|
|
|
|
c_pri = prioritynames;
|
|
|
|
while (c_pri->c_name) {
|
|
|
|
if (c_pri->c_val != LOG_PRI(pri)) {
|
2008-02-13 09:19:14 +00:00
|
|
|
c_pri++;
|
|
|
|
continue;
|
2007-01-04 17:57:54 +00:00
|
|
|
}
|
|
|
|
snprintf(res20, 20, "%s.%s",
|
|
|
|
c_fac->c_name, c_pri->c_name);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
/* prio not found, bail out */
|
|
|
|
break;
|
2002-11-10 22:46:45 +00:00
|
|
|
}
|
2007-01-04 17:57:54 +00:00
|
|
|
snprintf(res20, 20, "<%d>", pri);
|
2000-02-11 21:55:04 +00:00
|
|
|
}
|
2007-01-04 17:57:54 +00:00
|
|
|
}
|
2000-02-08 19:58:47 +00:00
|
|
|
|
2007-01-04 21:22:11 +00:00
|
|
|
/* len parameter is used only for "is there a timestamp?" check.
|
2007-11-06 01:38:46 +00:00
|
|
|
* NB: some callers cheat and supply len==0 when they know
|
|
|
|
* that there is no timestamp, short-circuiting the test. */
|
2007-01-04 17:57:54 +00:00
|
|
|
static void timestamp_and_log(int pri, char *msg, int len)
|
|
|
|
{
|
|
|
|
char *timestamp;
|
2008-01-03 12:13:42 +00:00
|
|
|
time_t now;
|
2008-01-03 12:12:27 +00:00
|
|
|
|
2009-04-22 02:53:02 +00:00
|
|
|
/* Jan 18 00:11:22 msg... */
|
|
|
|
/* 01234567890123456 */
|
2007-01-04 17:57:54 +00:00
|
|
|
if (len < 16 || msg[3] != ' ' || msg[6] != ' '
|
|
|
|
|| msg[9] != ':' || msg[12] != ':' || msg[15] != ' '
|
|
|
|
) {
|
2000-02-08 19:58:47 +00:00
|
|
|
time(&now);
|
2008-01-03 12:13:42 +00:00
|
|
|
timestamp = ctime(&now) + 4; /* skip day of week */
|
2000-02-08 19:58:47 +00:00
|
|
|
} else {
|
2008-01-03 12:13:42 +00:00
|
|
|
now = 0;
|
2000-02-08 19:58:47 +00:00
|
|
|
timestamp = msg;
|
|
|
|
msg += 16;
|
|
|
|
}
|
2007-01-04 17:57:54 +00:00
|
|
|
timestamp[15] = '\0';
|
2000-02-08 19:58:47 +00:00
|
|
|
|
2008-01-03 12:12:27 +00:00
|
|
|
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-25 23:23:58 +00:00
|
|
|
sprintf(G.printbuf, "%s %.64s %s %s\n", timestamp, G.hostname, res, msg);
|
2000-12-08 19:52:01 +00:00
|
|
|
}
|
2008-01-03 12:13:42 +00:00
|
|
|
|
|
|
|
/* Log message locally (to file or shared mem) */
|
|
|
|
log_locally(now, G.printbuf);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void timestamp_and_log_internal(const char *msg)
|
|
|
|
{
|
2008-12-09 22:53:31 +00:00
|
|
|
/* -L, or no -R */
|
2008-01-03 12:13:42 +00:00
|
|
|
if (ENABLE_FEATURE_REMOTE_LOG && !(option_mask32 & OPT_locallog))
|
|
|
|
return;
|
|
|
|
timestamp_and_log(LOG_SYSLOG | LOG_INFO, (char*)msg, 0);
|
2007-01-04 17:57:54 +00:00
|
|
|
}
|
2004-09-14 18:12:13 +00:00
|
|
|
|
2008-02-13 09:19:14 +00:00
|
|
|
/* 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 17:57:54 +00:00
|
|
|
static void split_escape_and_log(char *tmpbuf, int len)
|
|
|
|
{
|
|
|
|
char *p = tmpbuf;
|
|
|
|
|
|
|
|
tmpbuf += len;
|
|
|
|
while (p < tmpbuf) {
|
|
|
|
char c;
|
2007-03-20 20:03:03 +00:00
|
|
|
char *q = G.parsebuf;
|
2007-01-04 17:57:54 +00:00
|
|
|
int pri = (LOG_USER | LOG_NOTICE);
|
|
|
|
|
|
|
|
if (*p == '<') {
|
2007-01-04 21:22:11 +00:00
|
|
|
/* Parse the magic priority number */
|
2007-01-04 17:57:54 +00:00
|
|
|
pri = bb_strtou(p + 1, &p, 10);
|
2007-11-06 01:38:46 +00:00
|
|
|
if (*p == '>')
|
|
|
|
p++;
|
|
|
|
if (pri & ~(LOG_FACMASK | LOG_PRIMASK))
|
2007-01-04 17:57:54 +00:00
|
|
|
pri = (LOG_USER | LOG_NOTICE);
|
2006-09-30 19:17:40 +00:00
|
|
|
}
|
2007-01-04 17:57:54 +00:00
|
|
|
|
|
|
|
while ((c = *p++)) {
|
|
|
|
if (c == '\n')
|
|
|
|
c = ' ';
|
2007-06-21 13:44:53 +00:00
|
|
|
if (!(c & ~0x1f) && c != '\t') {
|
2007-01-04 17:57:54 +00:00
|
|
|
*q++ = '^';
|
|
|
|
c += '@'; /* ^@, ^A, ^B... */
|
|
|
|
}
|
|
|
|
*q++ = c;
|
|
|
|
}
|
|
|
|
*q = '\0';
|
2008-01-03 12:12:27 +00:00
|
|
|
|
2007-01-04 21:22:11 +00:00
|
|
|
/* Now log it */
|
2008-01-03 12:12:27 +00:00
|
|
|
if (LOG_PRI(pri) < G.logLevel)
|
|
|
|
timestamp_and_log(pri, G.parsebuf, q - G.parsebuf);
|
2004-06-22 10:12:59 +00:00
|
|
|
}
|
1999-11-24 09:04:33 +00:00
|
|
|
}
|
|
|
|
|
2007-02-14 20:51:46 +00:00
|
|
|
#ifdef SYSLOGD_MARK
|
2007-01-04 17:57:54 +00:00
|
|
|
static void do_mark(int sig)
|
1999-11-25 07:30:46 +00:00
|
|
|
{
|
2007-03-15 19:50:46 +00:00
|
|
|
if (G.markInterval) {
|
2008-01-03 12:13:42 +00:00
|
|
|
timestamp_and_log_internal("-- MARK --");
|
2007-03-15 19:50:46 +00:00
|
|
|
alarm(G.markInterval);
|
2000-02-08 19:58:47 +00:00
|
|
|
}
|
1999-11-25 07:30:46 +00:00
|
|
|
}
|
2007-02-14 20:51:46 +00:00
|
|
|
#endif
|
1999-11-25 07:30:46 +00:00
|
|
|
|
2007-11-10 01:28:19 +00:00
|
|
|
/* Don't inline: prevent struct sockaddr_un to take up space on stack
|
|
|
|
* permanently */
|
|
|
|
static NOINLINE int create_socket(void)
|
1999-11-25 07:30:46 +00:00
|
|
|
{
|
2000-02-08 19:58:47 +00:00
|
|
|
struct sockaddr_un sunx;
|
2007-09-07 13:53:32 +00:00
|
|
|
int sock_fd;
|
2007-02-11 16:19:28 +00:00
|
|
|
char *dev_log_name;
|
2000-04-18 23:51:51 +00:00
|
|
|
|
2007-11-10 01:28:19 +00:00
|
|
|
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) */
|
|
|
|
strcpy(sunx.sun_path, "/dev/log");
|
|
|
|
dev_log_name = xmalloc_follow_symlinks("/dev/log");
|
|
|
|
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));
|
|
|
|
chmod("/dev/log", 0666);
|
|
|
|
|
|
|
|
return sock_fd;
|
|
|
|
}
|
|
|
|
|
2008-01-03 12:12:27 +00:00
|
|
|
#if ENABLE_FEATURE_REMOTE_LOG
|
2010-02-28 12:01:59 +00:00
|
|
|
static int try_to_resolve_remote(remoteHost_t *rh)
|
2008-01-03 12:12:27 +00:00
|
|
|
{
|
2010-02-28 12:01:59 +00:00
|
|
|
if (!rh->remoteAddr) {
|
2008-01-03 12:12:27 +00:00
|
|
|
unsigned now = monotonic_sec();
|
|
|
|
|
|
|
|
/* Don't resolve name too often - DNS timeouts can be big */
|
2010-02-28 12:01:59 +00:00
|
|
|
if ((now - rh->last_dns_resolve) < DNS_WAIT_SEC)
|
2008-01-03 12:12:27 +00:00
|
|
|
return -1;
|
2010-02-28 12:01:59 +00:00
|
|
|
rh->last_dns_resolve = now;
|
|
|
|
rh->remoteAddr = host2sockaddr(rh->remoteHostname, 514);
|
|
|
|
if (!rh->remoteAddr)
|
2008-01-03 12:12:27 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2010-08-03 02:26:20 +00:00
|
|
|
return xsocket(rh->remoteAddr->u.sa.sa_family, SOCK_DGRAM, 0);
|
2008-01-03 12:12:27 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-07-05 09:18:54 +00:00
|
|
|
static void do_syslogd(void) NORETURN;
|
2007-11-10 01:28:19 +00:00
|
|
|
static void do_syslogd(void)
|
|
|
|
{
|
|
|
|
int sock_fd;
|
2010-02-28 12:01:59 +00:00
|
|
|
#if ENABLE_FEATURE_REMOTE_LOG
|
|
|
|
llist_t *item;
|
|
|
|
#endif
|
2008-02-26 20:13:52 +00:00
|
|
|
#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 01:28:19 +00:00
|
|
|
|
2008-12-09 22:53:31 +00:00
|
|
|
/* 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-10 22:46:45 +00:00
|
|
|
signal(SIGHUP, SIG_IGN);
|
2007-02-14 20:51:46 +00:00
|
|
|
#ifdef SYSLOGD_MARK
|
2007-01-04 17:57:54 +00:00
|
|
|
signal(SIGALRM, do_mark);
|
2007-03-15 19:50:46 +00:00
|
|
|
alarm(G.markInterval);
|
2007-02-14 20:51:46 +00:00
|
|
|
#endif
|
2007-11-10 01:28:19 +00:00
|
|
|
sock_fd = create_socket();
|
2007-02-11 16:19:28 +00:00
|
|
|
|
2006-10-06 09:49:47 +00:00
|
|
|
if (ENABLE_FEATURE_IPC_SYSLOG && (option_mask32 & OPT_circularlog)) {
|
2002-11-10 22:46:45 +00:00
|
|
|
ipcsyslog_init();
|
2001-04-05 20:55:17 +00:00
|
|
|
}
|
|
|
|
|
2008-01-03 12:13:42 +00:00
|
|
|
timestamp_and_log_internal("syslogd started: BusyBox v" BB_VER);
|
2000-04-04 18:14:25 +00:00
|
|
|
|
2008-12-09 22:53:31 +00:00
|
|
|
while (!bb_got_signal) {
|
2008-05-15 21:30:45 +00:00
|
|
|
ssize_t sz;
|
2008-02-26 20:13:52 +00:00
|
|
|
|
|
|
|
#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 01:38:46 +00:00
|
|
|
read_again:
|
2008-12-09 22:53:31 +00:00
|
|
|
sz = read(sock_fd, recvbuf, MAX_READ - 1);
|
|
|
|
if (sz < 0) {
|
|
|
|
if (!bb_got_signal)
|
|
|
|
bb_perror_msg("read from /dev/log");
|
|
|
|
break;
|
|
|
|
}
|
2000-04-04 18:14:25 +00:00
|
|
|
|
2008-02-13 09:19:14 +00:00
|
|
|
/* Drop trailing '\n' and NULs (typically there is one NUL) */
|
2007-11-06 01:38:46 +00:00
|
|
|
while (1) {
|
|
|
|
if (sz == 0)
|
|
|
|
goto read_again;
|
2007-11-06 11:34:03 +00:00
|
|
|
/* 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 09:19:14 +00:00
|
|
|
* syslog(prio, "test\n") sends "test\n\0".
|
2007-11-06 11:34:03 +00:00
|
|
|
* IOW: newline is passed verbatim!
|
|
|
|
* I take it to mean that it's syslogd's job
|
2008-02-13 09:19:14 +00:00
|
|
|
* to make those look identical in the log files. */
|
2008-02-26 20:13:52 +00:00
|
|
|
if (recvbuf[sz-1] != '\0' && recvbuf[sz-1] != '\n')
|
2007-11-06 01:38:46 +00:00
|
|
|
break;
|
|
|
|
sz--;
|
|
|
|
}
|
2008-02-26 20:13:52 +00:00
|
|
|
#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 17:57:54 +00:00
|
|
|
#if ENABLE_FEATURE_REMOTE_LOG
|
2010-02-28 12:01:59 +00:00
|
|
|
/* Stock syslogd sends it '\n'-terminated
|
|
|
|
* over network, mimic that */
|
|
|
|
recvbuf[sz] = '\n';
|
|
|
|
|
2007-09-07 13:53:32 +00:00
|
|
|
/* 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 12:01:59 +00:00
|
|
|
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-10 22:46:45 +00:00
|
|
|
}
|
2010-08-03 02:26:20 +00:00
|
|
|
|
|
|
|
/* 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 13:43:28 +00:00
|
|
|
}
|
2007-09-07 13:53:32 +00:00
|
|
|
#endif
|
2008-02-13 09:19:14 +00:00
|
|
|
if (!ENABLE_FEATURE_REMOTE_LOG || (option_mask32 & OPT_locallog)) {
|
2008-02-26 20:13:52 +00:00
|
|
|
recvbuf[sz] = '\0'; /* ensure it *is* NUL terminated */
|
|
|
|
split_escape_and_log(recvbuf, sz);
|
2008-02-13 09:19:14 +00:00
|
|
|
}
|
2008-12-09 22:53:31 +00:00
|
|
|
} /* while (!bb_got_signal) */
|
|
|
|
|
|
|
|
timestamp_and_log_internal("syslogd exiting");
|
|
|
|
puts("syslogd exiting");
|
|
|
|
if (ENABLE_FEATURE_IPC_SYSLOG)
|
|
|
|
ipcsyslog_cleanup();
|
|
|
|
kill_myself_with_sig(bb_got_signal);
|
2008-06-11 15:43:19 +00:00
|
|
|
#undef recvbuf
|
1999-11-24 09:04:33 +00:00
|
|
|
}
|
|
|
|
|
2007-10-11 10:05:36 +00:00
|
|
|
int syslogd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
2008-07-05 09:18:54 +00:00
|
|
|
int syslogd_main(int argc UNUSED_PARAM, char **argv)
|
1999-11-25 07:30:46 +00:00
|
|
|
{
|
2008-12-09 22:53:31 +00:00
|
|
|
int opts;
|
2010-02-28 12:01:59 +00:00
|
|
|
char OPTION_DECL;
|
|
|
|
#if ENABLE_FEATURE_REMOTE_LOG
|
|
|
|
llist_t *remoteAddrList = NULL;
|
|
|
|
#endif
|
2000-02-08 19:58:47 +00:00
|
|
|
|
2008-01-03 12:12:27 +00:00
|
|
|
INIT_G();
|
2010-02-28 12:01:59 +00:00
|
|
|
|
|
|
|
/* No non-option params, -R can occur multiple times */
|
|
|
|
opt_complementary = "=0" IF_FEATURE_REMOTE_LOG(":R::");
|
|
|
|
opts = getopt32(argv, OPTION_STR, OPTION_PARAM);
|
2008-01-03 12:12:27 +00:00
|
|
|
#if ENABLE_FEATURE_REMOTE_LOG
|
2010-02-28 12:01:59 +00:00
|
|
|
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 12:12:27 +00:00
|
|
|
#endif
|
2007-03-15 19:50:46 +00:00
|
|
|
|
2007-02-14 20:51:46 +00:00
|
|
|
#ifdef SYSLOGD_MARK
|
2008-12-09 22:53:31 +00:00
|
|
|
if (opts & OPT_mark) // -m
|
2007-03-15 19:50:46 +00:00
|
|
|
G.markInterval = xatou_range(opt_m, 0, INT_MAX/60) * 60;
|
2007-02-14 20:51:46 +00:00
|
|
|
#endif
|
2008-12-09 22:53:31 +00:00
|
|
|
//if (opts & OPT_nofork) // -n
|
|
|
|
//if (opts & OPT_outfile) // -O
|
|
|
|
if (opts & OPT_loglevel) // -l
|
2007-03-15 19:50:46 +00:00
|
|
|
G.logLevel = xatou_range(opt_l, 1, 8);
|
2008-12-09 22:53:31 +00:00
|
|
|
//if (opts & OPT_small) // -S
|
2006-09-30 19:20:00 +00:00
|
|
|
#if ENABLE_FEATURE_ROTATE_LOGFILE
|
2008-12-09 22:53:31 +00:00
|
|
|
if (opts & OPT_filesize) // -s
|
2007-03-15 19:50:46 +00:00
|
|
|
G.logFileSize = xatou_range(opt_s, 0, INT_MAX/1024) * 1024;
|
2008-12-09 22:53:31 +00:00
|
|
|
if (opts & OPT_rotatecnt) // -b
|
2007-03-15 19:50:46 +00:00
|
|
|
G.logFileRotate = xatou_range(opt_b, 0, 99);
|
2001-03-12 22:51:50 +00:00
|
|
|
#endif
|
2006-09-30 19:20:00 +00:00
|
|
|
#if ENABLE_FEATURE_IPC_SYSLOG
|
2007-01-24 22:02:01 +00:00
|
|
|
if (opt_C) // -Cn
|
2007-03-15 19:50:46 +00:00
|
|
|
G.shm_size = xatoul_range(opt_C, 4, INT_MAX/1024) * 1024;
|
2006-09-30 19:20:00 +00:00
|
|
|
#endif
|
2000-02-08 19:58:47 +00:00
|
|
|
|
2000-12-11 19:28:29 +00:00
|
|
|
/* If they have not specified remote logging, then log locally */
|
2008-12-09 22:53:31 +00:00
|
|
|
if (ENABLE_FEATURE_REMOTE_LOG && !(opts & OPT_remotelog)) // -R
|
2006-10-06 09:49:47 +00:00
|
|
|
option_mask32 |= OPT_locallog;
|
2001-03-12 22:51:50 +00:00
|
|
|
|
2000-02-08 19:58:47 +00:00
|
|
|
/* Store away localhost's name before the fork */
|
2008-02-25 23:23:58 +00:00
|
|
|
G.hostname = safe_gethostname();
|
|
|
|
*strchrnul(G.hostname, '.') = '\0';
|
2000-02-08 19:58:47 +00:00
|
|
|
|
2008-12-09 22:53:31 +00:00
|
|
|
if (!(opts & OPT_nofork)) {
|
2007-03-26 13:20:54 +00:00
|
|
|
bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
|
2003-07-28 07:40:39 +00:00
|
|
|
}
|
2010-01-29 15:44:48 +00:00
|
|
|
//umask(0); - why??
|
2007-03-27 22:01:31 +00:00
|
|
|
write_pidfile("/var/run/syslogd.pid");
|
2007-01-04 17:57:54 +00:00
|
|
|
do_syslogd();
|
2007-01-06 22:08:53 +00:00
|
|
|
/* return EXIT_SUCCESS; */
|
1999-11-25 07:30:46 +00:00
|
|
|
}
|
2008-06-11 15:43:19 +00:00
|
|
|
|
|
|
|
/* Clean up. Needed because we are included from syslogd_and_logger.c */
|
2008-12-09 22:53:31 +00:00
|
|
|
#undef DEBUG
|
|
|
|
#undef SYSLOGD_MARK
|
|
|
|
#undef SYSLOGD_WRLOCK
|
2008-06-11 15:43:19 +00:00
|
|
|
#undef G
|
|
|
|
#undef GLOBALS
|
|
|
|
#undef INIT_G
|
|
|
|
#undef OPTION_STR
|
|
|
|
#undef OPTION_DECL
|
|
|
|
#undef OPTION_PARAM
|