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
|
|
|
|
2006-06-02 20:56:16 +00:00
|
|
|
#include "busybox.h"
|
2000-04-04 18:14:25 +00:00
|
|
|
#include <paths.h>
|
1999-11-24 09:04:33 +00:00
|
|
|
#include <sys/un.h>
|
2000-06-19 17:48:02 +00:00
|
|
|
|
1999-11-25 07:30:46 +00:00
|
|
|
/* SYSLOG_NAMES defined to pull some extra junk from syslog.h */
|
|
|
|
#define SYSLOG_NAMES
|
|
|
|
#include <sys/syslog.h>
|
2000-07-20 23:41:24 +00:00
|
|
|
#include <sys/uio.h>
|
1999-11-25 07:30:46 +00:00
|
|
|
|
2007-01-04 17:59:59 +00:00
|
|
|
#define DEBUG 0
|
|
|
|
|
2000-04-04 18:14:25 +00:00
|
|
|
/* Path to the unix socket */
|
2007-01-04 17:59:59 +00:00
|
|
|
static char *dev_log_name;
|
1999-11-25 07:30:46 +00:00
|
|
|
|
2006-09-30 19:20:00 +00:00
|
|
|
/* Path for the file where all log messages are written */
|
|
|
|
static const char *logFilePath = "/var/log/messages";
|
2007-01-04 18:02:32 +00:00
|
|
|
static int logFD = -1;
|
2000-02-08 19:58:47 +00:00
|
|
|
|
1999-11-25 07:30:46 +00:00
|
|
|
/* interval between marks in seconds */
|
2007-01-04 17:57:54 +00:00
|
|
|
static int markInterval = 20 * 60;
|
2000-02-08 19:58:47 +00:00
|
|
|
|
2006-09-30 19:17:40 +00:00
|
|
|
/* level of messages to be locally logged */
|
|
|
|
static int logLevel = 8;
|
|
|
|
|
1999-11-25 07:30:46 +00:00
|
|
|
/* localhost's name */
|
2007-01-04 17:57:54 +00:00
|
|
|
static char localHostName[64];
|
1999-11-24 09:04:33 +00:00
|
|
|
|
2007-01-04 17:59:59 +00:00
|
|
|
#if ENABLE_FEATURE_ROTATE_LOGFILE
|
|
|
|
/* max size of message file before being rotated */
|
2007-01-04 18:02:32 +00:00
|
|
|
static unsigned logFileSize = 200 * 1024;
|
2007-01-04 17:59:59 +00:00
|
|
|
/* number of rotated message files */
|
2007-01-04 18:02:32 +00:00
|
|
|
static unsigned logFileRotate = 1;
|
|
|
|
static unsigned curFileSize;
|
|
|
|
static smallint isRegular;
|
2007-01-04 17:59:59 +00:00
|
|
|
#endif
|
|
|
|
|
2007-01-04 17:57:54 +00:00
|
|
|
#if ENABLE_FEATURE_REMOTE_LOG
|
2000-07-20 23:41:24 +00:00
|
|
|
#include <netinet/in.h>
|
|
|
|
/* udp socket for logging to remote host */
|
2007-01-04 17:57:54 +00:00
|
|
|
static int remoteFD = -1;
|
|
|
|
static struct sockaddr_in remoteAddr;
|
2000-07-20 23:41:24 +00:00
|
|
|
#endif
|
|
|
|
|
2007-01-04 21:22:11 +00:00
|
|
|
/* We are using bb_common_bufsiz1 for buffering: */
|
|
|
|
enum { MAX_READ = (BUFSIZ/6) & ~0xf };
|
2007-01-06 22:08:53 +00:00
|
|
|
/* We recv into RECVBUF... (size: MAX_READ ~== BUFSIZ/6) */
|
2007-01-04 21:22:11 +00:00
|
|
|
#define RECVBUF bb_common_bufsiz1
|
2007-01-06 22:08:53 +00:00
|
|
|
/* ...then copy to PARSEBUF, escaping control chars */
|
|
|
|
/* (can grow x2 max ~== BUFSIZ/3) */
|
2007-01-04 21:22:11 +00:00
|
|
|
#define PARSEBUF (bb_common_bufsiz1 + MAX_READ)
|
2007-01-06 22:08:53 +00:00
|
|
|
/* ...then sprintf into PRINTBUF, adding timestamp (15 chars),
|
2007-01-04 21:22:11 +00:00
|
|
|
* host (64), fac.prio (20) to the message */
|
|
|
|
/* (growth by: 15 + 64 + 20 + delims = ~110) */
|
2007-01-06 22:08:53 +00:00
|
|
|
#define PRINTBUF (bb_common_bufsiz1 + 3*MAX_READ)
|
|
|
|
/* totals: BUFSIZ == BUFSIZ/6 + BUFSIZ/3 + (BUFSIZ/3+BUFSIZ/6)
|
2007-01-04 21:22:11 +00:00
|
|
|
* -- we have BUFSIZ/6 extra at the ent of PRINTBUF
|
|
|
|
* which covers needed ~110 extra bytes (and much more) */
|
|
|
|
|
|
|
|
|
|
|
|
/* 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
|
|
|
|
USE_FEATURE_ROTATE_LOGFILE(OPTBIT_filesize ,) // -s
|
|
|
|
USE_FEATURE_ROTATE_LOGFILE(OPTBIT_rotatecnt ,) // -b
|
|
|
|
USE_FEATURE_REMOTE_LOG( OPTBIT_remote ,) // -R
|
|
|
|
USE_FEATURE_REMOTE_LOG( OPTBIT_localtoo ,) // -L
|
|
|
|
USE_FEATURE_IPC_SYSLOG( OPTBIT_circularlog,) // -C
|
|
|
|
|
|
|
|
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 ,
|
|
|
|
OPT_filesize = USE_FEATURE_ROTATE_LOGFILE((1 << OPTBIT_filesize )) + 0,
|
|
|
|
OPT_rotatecnt = USE_FEATURE_ROTATE_LOGFILE((1 << OPTBIT_rotatecnt )) + 0,
|
|
|
|
OPT_remotelog = USE_FEATURE_REMOTE_LOG( (1 << OPTBIT_remote )) + 0,
|
|
|
|
OPT_locallog = USE_FEATURE_REMOTE_LOG( (1 << OPTBIT_localtoo )) + 0,
|
|
|
|
OPT_circularlog = USE_FEATURE_IPC_SYSLOG( (1 << OPTBIT_circularlog)) + 0,
|
|
|
|
};
|
|
|
|
#define OPTION_STR "m:nO:l:S" \
|
|
|
|
USE_FEATURE_ROTATE_LOGFILE("s:" ) \
|
|
|
|
USE_FEATURE_ROTATE_LOGFILE("b:" ) \
|
|
|
|
USE_FEATURE_REMOTE_LOG( "R:" ) \
|
|
|
|
USE_FEATURE_REMOTE_LOG( "L" ) \
|
|
|
|
USE_FEATURE_IPC_SYSLOG( "C::")
|
|
|
|
#define OPTION_DECL *opt_m, *opt_l \
|
|
|
|
USE_FEATURE_ROTATE_LOGFILE(,*opt_s) \
|
|
|
|
USE_FEATURE_ROTATE_LOGFILE(,*opt_b) \
|
|
|
|
USE_FEATURE_REMOTE_LOG( ,*opt_R) \
|
|
|
|
USE_FEATURE_IPC_SYSLOG( ,*opt_C = NULL)
|
|
|
|
#define OPTION_PARAM &opt_m, &logFilePath, &opt_l \
|
|
|
|
USE_FEATURE_ROTATE_LOGFILE(,&opt_s) \
|
|
|
|
USE_FEATURE_ROTATE_LOGFILE(,&opt_b) \
|
|
|
|
USE_FEATURE_REMOTE_LOG( ,&opt_R) \
|
|
|
|
USE_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
|
|
|
|
|
2001-03-12 22:51:50 +00:00
|
|
|
#include <sys/ipc.h>
|
|
|
|
#include <sys/sem.h>
|
|
|
|
#include <sys/shm.h>
|
|
|
|
|
|
|
|
/* our shared key */
|
2006-09-30 19:20:00 +00:00
|
|
|
#define KEY_ID ((long)0x414e4547) /* "GENA" */
|
2001-03-12 22:51:50 +00:00
|
|
|
|
|
|
|
// Semaphore operation structures
|
|
|
|
static struct shbuf_ds {
|
2007-01-04 17:57:54 +00:00
|
|
|
int32_t size; // size of data written
|
|
|
|
int32_t head; // start of message list
|
|
|
|
int32_t tail; // end of message list
|
2006-09-30 19:20:00 +00:00
|
|
|
char data[1]; // data/messages
|
2007-01-04 17:57:54 +00:00
|
|
|
} *shbuf; // shared memory pointer
|
2002-11-10 22:46:45 +00:00
|
|
|
|
2006-09-30 19:20:00 +00:00
|
|
|
static int shmid = -1; // ipc shared memory id
|
|
|
|
static int s_semid = -1; // ipc semaphore id
|
2003-12-19 11:32:14 +00:00
|
|
|
static int shm_size = ((CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE)*1024); // default shm size
|
2002-09-17 20:06:29 +00:00
|
|
|
|
2005-09-22 12:59:26 +00:00
|
|
|
static void ipcsyslog_cleanup(void)
|
2002-11-10 22:46:45 +00:00
|
|
|
{
|
|
|
|
if (shmid != -1) {
|
2006-09-30 19:20:00 +00:00
|
|
|
shmdt(shbuf);
|
2002-11-10 22:46:45 +00:00
|
|
|
}
|
|
|
|
if (shmid != -1) {
|
2001-03-12 22:51:50 +00:00
|
|
|
shmctl(shmid, IPC_RMID, NULL);
|
2002-11-10 22:46:45 +00:00
|
|
|
}
|
|
|
|
if (s_semid != -1) {
|
2001-03-12 22:51:50 +00:00
|
|
|
semctl(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)
|
|
|
|
printf("shmget(%lx, %d,...)\n", KEY_ID, shm_size);
|
|
|
|
|
2007-01-04 17:57:54 +00:00
|
|
|
shmid = shmget(KEY_ID, shm_size, IPC_CREAT | 1023);
|
|
|
|
if (shmid == -1) {
|
|
|
|
bb_perror_msg_and_die("shmget");
|
|
|
|
}
|
2001-03-12 22:51:50 +00:00
|
|
|
|
2007-01-04 17:57:54 +00:00
|
|
|
shbuf = shmat(shmid, NULL, 0);
|
|
|
|
if (!shbuf) {
|
|
|
|
bb_perror_msg_and_die("shmat");
|
|
|
|
}
|
2001-03-12 22:51:50 +00:00
|
|
|
|
2007-01-04 17:57:54 +00:00
|
|
|
shbuf->size = shm_size - offsetof(struct shbuf_ds, data);
|
|
|
|
shbuf->head = 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)
|
|
|
|
s_semid = semget(KEY_ID, 2, IPC_CREAT | IPC_EXCL | 1023);
|
|
|
|
if (s_semid == -1) {
|
|
|
|
if (errno == EEXIST) {
|
|
|
|
s_semid = semget(KEY_ID, 2, 0);
|
|
|
|
if (s_semid != -1)
|
|
|
|
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 21:22:11 +00:00
|
|
|
/* Why libc insists on these being rw? */
|
|
|
|
static struct sembuf SMwup[1] = { {1, -1, IPC_NOWAIT} };
|
|
|
|
static struct sembuf SMwdn[3] = { {0, 0}, {1, 0}, {1, +1} };
|
2007-01-04 17:57:54 +00:00
|
|
|
|
|
|
|
int old_tail, new_tail;
|
|
|
|
char *c;
|
2001-03-12 22:51:50 +00:00
|
|
|
|
- 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
|
|
|
if (semop(s_semid, SMwdn, 3) == -1) {
|
|
|
|
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-04 17:57:54 +00:00
|
|
|
* tail == position where to store next syslog message.
|
|
|
|
* head == position of next message to retrieve ("print").
|
|
|
|
* if head == tail, there is no "unprinted" messages left.
|
|
|
|
* head is typically advanced by separate "reader" program,
|
|
|
|
* but if there isn't one, we have to do it ourself.
|
|
|
|
* messages are NUL-separated.
|
2001-03-12 22:51:50 +00:00
|
|
|
*/
|
2007-01-04 17:57:54 +00:00
|
|
|
len++; /* length with NUL included */
|
|
|
|
again:
|
|
|
|
old_tail = shbuf->tail;
|
|
|
|
new_tail = old_tail + len;
|
|
|
|
if (new_tail < shbuf->size) {
|
|
|
|
/* No need to move head if shbuf->head <= old_tail,
|
|
|
|
* else... */
|
|
|
|
if (old_tail < shbuf->head && shbuf->head <= new_tail) {
|
|
|
|
/* ...need to move head forward */
|
|
|
|
c = memchr(shbuf->data + new_tail, '\0',
|
|
|
|
shbuf->size - new_tail);
|
|
|
|
if (!c) /* no NUL ahead of us, wrap around */
|
|
|
|
c = memchr(shbuf->data, '\0', old_tail);
|
|
|
|
if (!c) { /* still nothing? point to this msg... */
|
|
|
|
shbuf->head = old_tail;
|
|
|
|
} else {
|
|
|
|
/* convert pointer to offset + skip NUL */
|
|
|
|
shbuf->head = c - shbuf->data + 1;
|
2001-03-12 22:51:50 +00:00
|
|
|
}
|
2002-11-10 22:46:45 +00:00
|
|
|
}
|
2007-01-04 17:57:54 +00:00
|
|
|
/* store message, set new tail */
|
|
|
|
memcpy(shbuf->data + old_tail, msg, len);
|
|
|
|
shbuf->tail = new_tail;
|
2002-11-10 22:46:45 +00:00
|
|
|
} else {
|
2007-01-04 17:57:54 +00:00
|
|
|
/* we need to break up the message and wrap it around */
|
|
|
|
/* k == available buffer space ahead of old tail */
|
|
|
|
int k = shbuf->size - old_tail - 1;
|
|
|
|
if (shbuf->head > old_tail) {
|
|
|
|
/* we are going to overwrite head, need to
|
|
|
|
* move it out of the way */
|
|
|
|
c = memchr(shbuf->data, '\0', old_tail);
|
|
|
|
if (!c) { /* nothing? point to this msg... */
|
|
|
|
shbuf->head = old_tail;
|
|
|
|
} else { /* convert pointer to offset + skip NUL */
|
|
|
|
shbuf->head = c - shbuf->data + 1;
|
|
|
|
}
|
2001-03-12 22:51:50 +00:00
|
|
|
}
|
2007-01-04 17:57:54 +00:00
|
|
|
/* copy what fits to the end of buffer, and repeat */
|
|
|
|
memcpy(shbuf->data + old_tail, msg, k);
|
|
|
|
msg += k;
|
|
|
|
len -= k;
|
|
|
|
shbuf->tail = 0;
|
|
|
|
goto again;
|
2001-03-12 22:51:50 +00:00
|
|
|
}
|
- 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
|
|
|
if (semop(s_semid, SMwup, 1) == -1) {
|
|
|
|
bb_perror_msg_and_die("SMwup");
|
|
|
|
}
|
2007-01-04 17:59:59 +00:00
|
|
|
if (DEBUG)
|
|
|
|
printf("head:%d tail:%d\n", shbuf->head, 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);
|
2002-09-17 20:06:29 +00:00
|
|
|
|
2000-02-08 19:58:47 +00:00
|
|
|
|
2007-01-04 17:57:54 +00:00
|
|
|
#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. */
|
|
|
|
static void log_locally(char *msg)
|
|
|
|
{
|
2007-01-04 18:02:32 +00:00
|
|
|
static time_t last;
|
|
|
|
|
|
|
|
struct flock fl;
|
|
|
|
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
|
|
|
|
if ((option_mask32 & OPT_circularlog) && shbuf) {
|
|
|
|
log_to_shmem(msg, len);
|
|
|
|
return;
|
|
|
|
}
|
2001-03-12 22:51:50 +00:00
|
|
|
#endif
|
2007-01-04 18:02:32 +00:00
|
|
|
if (logFD >= 0) {
|
|
|
|
time_t cur;
|
|
|
|
time(&cur);
|
|
|
|
if (last != cur) {
|
|
|
|
last = cur; /* reopen log file every second */
|
|
|
|
close(logFD);
|
|
|
|
goto reopen;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
struct stat statf;
|
|
|
|
reopen:
|
|
|
|
logFD = device_open(logFilePath, O_WRONLY | O_CREAT
|
2006-09-08 17:31:55 +00:00
|
|
|
| O_NOCTTY | O_APPEND | O_NONBLOCK);
|
2007-01-04 18:02:32 +00:00
|
|
|
if (logFD < 0) {
|
|
|
|
/* cannot open logfile? - print to /dev/console then */
|
|
|
|
int fd = device_open(_PATH_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;
|
|
|
|
}
|
|
|
|
#if ENABLE_FEATURE_ROTATE_LOGFILE
|
|
|
|
isRegular = (fstat(logFD, &statf) == 0 && (statf.st_mode & S_IFREG));
|
|
|
|
/* bug (mostly harmless): can wrap around if file > 4gb */
|
|
|
|
curFileSize = statf.st_size;
|
|
|
|
#endif
|
|
|
|
}
|
2007-01-04 17:57:54 +00:00
|
|
|
|
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;
|
|
|
|
fcntl(logFD, F_SETLKW, &fl);
|
- 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-01-04 18:02:32 +00:00
|
|
|
if (logFileSize && isRegular && curFileSize > logFileSize) {
|
|
|
|
if (logFileRotate) { /* always 0..99 */
|
|
|
|
int i = strlen(logFilePath) + 3 + 1;
|
|
|
|
char oldFile[i];
|
|
|
|
char newFile[i];
|
|
|
|
i = logFileRotate - 1;
|
|
|
|
/* rename: f.8 -> f.9; f.7 -> f.8; ... */
|
|
|
|
while (1) {
|
|
|
|
sprintf(newFile, "%s.%d", logFilePath, i);
|
|
|
|
if (i == 0) break;
|
|
|
|
sprintf(oldFile, "%s.%d", logFilePath, --i);
|
|
|
|
rename(oldFile, newFile);
|
2003-10-09 09:43:18 +00:00
|
|
|
}
|
2007-01-04 18:02:32 +00:00
|
|
|
/* newFile == "f.0" now */
|
|
|
|
rename(logFilePath, newFile);
|
|
|
|
fl.l_type = F_UNLCK;
|
|
|
|
fcntl(logFD, F_SETLKW, &fl);
|
|
|
|
close(logFD);
|
|
|
|
goto reopen;
|
2003-10-09 09:43:18 +00:00
|
|
|
}
|
2007-01-04 18:02:32 +00:00
|
|
|
ftruncate(logFD, 0);
|
1999-11-25 07:30:46 +00:00
|
|
|
}
|
2007-01-04 18:02:32 +00:00
|
|
|
#endif
|
|
|
|
curFileSize += full_write(logFD, msg, len);
|
|
|
|
fl.l_type = F_UNLCK;
|
|
|
|
fcntl(logFD, F_SETLKW, &fl);
|
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
|
|
|
{
|
2000-02-08 19:58:47 +00:00
|
|
|
CODE *c_pri, *c_fac;
|
|
|
|
|
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)) {
|
|
|
|
c_fac++; continue;
|
|
|
|
}
|
|
|
|
/* facility is found, look for prio */
|
|
|
|
c_pri = prioritynames;
|
|
|
|
while (c_pri->c_name) {
|
|
|
|
if (c_pri->c_val != LOG_PRI(pri)) {
|
|
|
|
c_pri++; continue;
|
|
|
|
}
|
|
|
|
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-01-04 17:57:54 +00:00
|
|
|
* NB: some callers cheat and supply 0 when they know
|
2007-01-04 21:22:11 +00:00
|
|
|
* that there is no timestamp, short-cutting the test. */
|
2007-01-04 17:57:54 +00:00
|
|
|
static void timestamp_and_log(int pri, char *msg, int len)
|
|
|
|
{
|
|
|
|
time_t now;
|
|
|
|
char *timestamp;
|
|
|
|
|
|
|
|
if (len < 16 || msg[3] != ' ' || msg[6] != ' '
|
|
|
|
|| msg[9] != ':' || msg[12] != ':' || msg[15] != ' '
|
|
|
|
) {
|
2000-02-08 19:58:47 +00:00
|
|
|
time(&now);
|
|
|
|
timestamp = ctime(&now) + 4;
|
|
|
|
} else {
|
|
|
|
timestamp = msg;
|
|
|
|
msg += 16;
|
|
|
|
}
|
2007-01-04 17:57:54 +00:00
|
|
|
timestamp[15] = '\0';
|
2000-02-08 19:58:47 +00:00
|
|
|
|
2007-01-04 17:57:54 +00:00
|
|
|
/* Log message locally (to file or shared mem) */
|
|
|
|
if (!ENABLE_FEATURE_REMOTE_LOG || (option_mask32 & OPT_locallog)) {
|
|
|
|
if (LOG_PRI(pri) < logLevel) {
|
|
|
|
if (option_mask32 & OPT_small)
|
2007-01-04 21:22:11 +00:00
|
|
|
sprintf(PRINTBUF, "%s %s\n", timestamp, msg);
|
2007-01-04 17:57:54 +00:00
|
|
|
else {
|
|
|
|
char res[20];
|
|
|
|
parse_fac_prio_20(pri, res);
|
2007-01-04 21:22:11 +00:00
|
|
|
sprintf(PRINTBUF, "%s %s %s %s\n", timestamp, localHostName, res, msg);
|
2007-01-04 17:57:54 +00:00
|
|
|
}
|
2007-01-04 21:22:11 +00:00
|
|
|
log_locally(PRINTBUF);
|
2000-12-08 19:52:01 +00:00
|
|
|
}
|
|
|
|
}
|
2007-01-04 17:57:54 +00:00
|
|
|
}
|
2004-09-14 18:12:13 +00:00
|
|
|
|
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-01-04 21:22:11 +00:00
|
|
|
char *q = 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);
|
|
|
|
if (*p == '>') p++;
|
|
|
|
if (pri & ~(LOG_FACMASK | LOG_PRIMASK)) {
|
|
|
|
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 = ' ';
|
|
|
|
if (!(c & ~0x1f)) {
|
|
|
|
*q++ = '^';
|
|
|
|
c += '@'; /* ^@, ^A, ^B... */
|
|
|
|
}
|
|
|
|
*q++ = c;
|
|
|
|
}
|
|
|
|
*q = '\0';
|
2007-01-04 21:22:11 +00:00
|
|
|
/* Now log it */
|
|
|
|
timestamp_and_log(pri, PARSEBUF, q - PARSEBUF);
|
2004-06-22 10:12:59 +00:00
|
|
|
}
|
1999-11-24 09:04:33 +00:00
|
|
|
}
|
|
|
|
|
1999-11-25 07:30:46 +00:00
|
|
|
static void quit_signal(int sig)
|
|
|
|
{
|
2007-01-04 17:57:54 +00:00
|
|
|
timestamp_and_log(LOG_SYSLOG | LOG_INFO, "System log daemon exiting", 0);
|
|
|
|
puts("System log daemon exiting");
|
|
|
|
unlink(dev_log_name);
|
- 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
|
|
|
if (ENABLE_FEATURE_IPC_SYSLOG)
|
|
|
|
ipcsyslog_cleanup();
|
2006-09-30 19:21:24 +00:00
|
|
|
exit(1);
|
1999-11-25 07:30:46 +00:00
|
|
|
}
|
1999-11-24 09:04:33 +00:00
|
|
|
|
2007-01-04 17:57:54 +00:00
|
|
|
static void do_mark(int sig)
|
1999-11-25 07:30:46 +00:00
|
|
|
{
|
2007-01-04 17:57:54 +00:00
|
|
|
if (markInterval) {
|
|
|
|
timestamp_and_log(LOG_SYSLOG | LOG_INFO, "-- MARK --", 0);
|
|
|
|
alarm(markInterval);
|
2000-02-08 19:58:47 +00:00
|
|
|
}
|
1999-11-25 07:30:46 +00:00
|
|
|
}
|
|
|
|
|
2007-01-04 17:57:54 +00:00
|
|
|
static void do_syslogd(void) ATTRIBUTE_NORETURN;
|
|
|
|
static void do_syslogd(void)
|
1999-11-25 07:30:46 +00:00
|
|
|
{
|
2000-02-08 19:58:47 +00:00
|
|
|
struct sockaddr_un sunx;
|
2000-04-21 01:26:49 +00:00
|
|
|
socklen_t addrLength;
|
2000-04-04 18:14:25 +00:00
|
|
|
int sock_fd;
|
2000-04-18 23:51:51 +00:00
|
|
|
fd_set fds;
|
|
|
|
|
2007-01-06 22:08:53 +00:00
|
|
|
/* Set up signal handlers */
|
2002-11-10 22:46:45 +00:00
|
|
|
signal(SIGINT, quit_signal);
|
|
|
|
signal(SIGTERM, quit_signal);
|
|
|
|
signal(SIGQUIT, quit_signal);
|
|
|
|
signal(SIGHUP, SIG_IGN);
|
|
|
|
signal(SIGCHLD, SIG_IGN);
|
2000-09-13 14:14:29 +00:00
|
|
|
#ifdef SIGCLD
|
2002-11-10 22:46:45 +00:00
|
|
|
signal(SIGCLD, SIG_IGN);
|
2000-09-13 14:14:29 +00:00
|
|
|
#endif
|
2007-01-04 17:57:54 +00:00
|
|
|
signal(SIGALRM, do_mark);
|
|
|
|
alarm(markInterval);
|
2000-04-04 18:14:25 +00:00
|
|
|
|
2007-01-04 17:59:59 +00:00
|
|
|
dev_log_name = xmalloc_realpath(_PATH_LOG);
|
|
|
|
if (!dev_log_name)
|
|
|
|
dev_log_name = _PATH_LOG;
|
|
|
|
|
2007-01-04 17:57:54 +00:00
|
|
|
/* Unlink old /dev/log (or object it points to) */
|
2007-01-04 17:59:59 +00:00
|
|
|
unlink(dev_log_name);
|
2000-04-04 18:14:25 +00:00
|
|
|
|
2002-11-10 22:46:45 +00:00
|
|
|
memset(&sunx, 0, sizeof(sunx));
|
2000-04-04 18:14:25 +00:00
|
|
|
sunx.sun_family = AF_UNIX;
|
2007-01-04 17:57:54 +00:00
|
|
|
strncpy(sunx.sun_path, dev_log_name, sizeof(sunx.sun_path));
|
2006-08-03 15:41:12 +00:00
|
|
|
sock_fd = xsocket(AF_UNIX, SOCK_DGRAM, 0);
|
2002-11-10 22:46:45 +00:00
|
|
|
addrLength = sizeof(sunx.sun_family) + strlen(sunx.sun_path);
|
|
|
|
if (bind(sock_fd, (struct sockaddr *) &sunx, addrLength) < 0) {
|
2007-01-04 17:57:54 +00:00
|
|
|
bb_perror_msg_and_die("cannot connect to socket %s", dev_log_name);
|
2002-11-10 22:46:45 +00:00
|
|
|
}
|
2000-04-04 18:14:25 +00:00
|
|
|
|
2007-01-04 17:57:54 +00:00
|
|
|
if (chmod(dev_log_name, 0666) < 0) {
|
|
|
|
bb_perror_msg_and_die("cannot set permission on %s", dev_log_name);
|
2002-11-10 22:46:45 +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
|
|
|
}
|
|
|
|
|
2007-01-04 17:57:54 +00:00
|
|
|
timestamp_and_log(LOG_SYSLOG | LOG_INFO, "syslogd started: BusyBox v" BB_VER, 0);
|
2000-04-04 18:14:25 +00:00
|
|
|
|
|
|
|
for (;;) {
|
2002-11-10 22:46:45 +00:00
|
|
|
FD_ZERO(&fds);
|
|
|
|
FD_SET(sock_fd, &fds);
|
2000-04-04 18:14:25 +00:00
|
|
|
|
2002-11-10 22:46:45 +00:00
|
|
|
if (select(sock_fd + 1, &fds, NULL, NULL, NULL) < 0) {
|
2002-09-17 20:06:29 +00:00
|
|
|
if (errno == EINTR) {
|
2007-01-06 22:08:53 +00:00
|
|
|
/* alarm may have happened */
|
2002-09-17 20:06:29 +00:00
|
|
|
continue;
|
|
|
|
}
|
2006-09-30 19:20:00 +00:00
|
|
|
bb_perror_msg_and_die("select");
|
2000-04-04 18:14:25 +00:00
|
|
|
}
|
|
|
|
|
2002-11-10 22:46:45 +00:00
|
|
|
if (FD_ISSET(sock_fd, &fds)) {
|
|
|
|
int i;
|
2007-01-04 21:22:11 +00:00
|
|
|
i = recv(sock_fd, RECVBUF, MAX_READ - 1, 0);
|
2007-01-04 17:57:54 +00:00
|
|
|
if (i <= 0)
|
2003-03-19 09:13:01 +00:00
|
|
|
bb_perror_msg_and_die("UNIX socket error");
|
2007-01-04 21:22:11 +00:00
|
|
|
/* TODO: maybe suppress duplicates? */
|
2007-01-04 17:57:54 +00:00
|
|
|
#if ENABLE_FEATURE_REMOTE_LOG
|
|
|
|
/* We are not modifying log messages in any way before send */
|
|
|
|
/* Remote site cannot trust _us_ anyway and need to do validation again */
|
|
|
|
if (option_mask32 & OPT_remotelog) {
|
|
|
|
if (-1 == remoteFD) {
|
|
|
|
remoteFD = socket(AF_INET, SOCK_DGRAM, 0);
|
|
|
|
}
|
|
|
|
if (-1 != remoteFD) {
|
|
|
|
/* send message to remote logger, ignore possible error */
|
2007-01-04 21:22:11 +00:00
|
|
|
sendto(remoteFD, RECVBUF, i, MSG_DONTWAIT,
|
2007-01-04 17:57:54 +00:00
|
|
|
(struct sockaddr *) &remoteAddr,
|
|
|
|
sizeof(remoteAddr));
|
|
|
|
}
|
2002-11-10 22:46:45 +00:00
|
|
|
}
|
2007-01-04 17:57:54 +00:00
|
|
|
#endif
|
2007-01-04 21:22:11 +00:00
|
|
|
RECVBUF[i] = '\0';
|
|
|
|
split_escape_and_log(RECVBUF, i);
|
2007-01-04 17:57:54 +00:00
|
|
|
} /* FD_ISSET() */
|
|
|
|
} /* for */
|
1999-11-24 09:04:33 +00:00
|
|
|
}
|
|
|
|
|
2006-03-06 20:47:33 +00:00
|
|
|
int syslogd_main(int argc, char **argv)
|
1999-11-25 07:30:46 +00:00
|
|
|
{
|
2006-09-30 19:20:00 +00:00
|
|
|
char OPTION_DECL;
|
2000-02-08 19:58:47 +00:00
|
|
|
char *p;
|
|
|
|
|
2000-12-11 16:48:50 +00:00
|
|
|
/* do normal option parsing */
|
2007-01-04 17:59:59 +00:00
|
|
|
opt_complementary = "=0"; /* no non-option params */
|
2006-10-06 09:49:47 +00:00
|
|
|
getopt32(argc, argv, OPTION_STR, OPTION_PARAM);
|
2007-01-04 17:57:54 +00:00
|
|
|
if (option_mask32 & OPT_mark) // -m
|
|
|
|
markInterval = xatou_range(opt_m, 0, INT_MAX/60) * 60;
|
2006-10-06 09:49:47 +00:00
|
|
|
//if (option_mask32 & OPT_nofork) // -n
|
|
|
|
//if (option_mask32 & OPT_outfile) // -O
|
2007-01-04 17:57:54 +00:00
|
|
|
if (option_mask32 & OPT_loglevel) // -l
|
|
|
|
logLevel = xatou_range(opt_l, 1, 8);
|
2006-10-06 09:49:47 +00:00
|
|
|
//if (option_mask32 & OPT_small) // -S
|
2006-09-30 19:20:00 +00:00
|
|
|
#if ENABLE_FEATURE_ROTATE_LOGFILE
|
2007-01-04 17:57:54 +00:00
|
|
|
if (option_mask32 & OPT_filesize) // -s
|
|
|
|
logFileSize = xatou_range(opt_s, 0, INT_MAX/1024) * 1024;
|
|
|
|
if (option_mask32 & OPT_rotatecnt) // -b
|
|
|
|
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_REMOTE_LOG
|
2006-10-06 09:49:47 +00:00
|
|
|
if (option_mask32 & OPT_remotelog) { // -R
|
2006-09-30 19:21:24 +00:00
|
|
|
int port = 514;
|
2007-01-04 17:57:54 +00:00
|
|
|
p = strchr(opt_R, ':');
|
2006-09-30 19:20:00 +00:00
|
|
|
if (p) {
|
2007-01-04 17:57:54 +00:00
|
|
|
*p++ = '\0';
|
|
|
|
port = xatou16(p);
|
2006-09-30 19:20:00 +00:00
|
|
|
}
|
2007-01-04 17:57:54 +00:00
|
|
|
remoteAddr.sin_family = AF_INET;
|
2006-09-30 19:21:24 +00:00
|
|
|
/* FIXME: looks ip4-specific. need to do better */
|
2007-01-04 17:57:54 +00:00
|
|
|
remoteAddr.sin_addr = *(struct in_addr *) *(xgethostbyname(opt_R)->h_addr_list);
|
|
|
|
remoteAddr.sin_port = htons(port);
|
2006-09-30 19:20:00 +00:00
|
|
|
}
|
2006-10-06 09:49:47 +00:00
|
|
|
//if (option_mask32 & OPT_locallog) // -L
|
2000-07-20 23:41:24 +00:00
|
|
|
#endif
|
2006-09-30 19:20:00 +00:00
|
|
|
#if ENABLE_FEATURE_IPC_SYSLOG
|
2007-01-04 17:57:54 +00:00
|
|
|
if ((option_mask32 & OPT_circularlog) && opt_C) // -C
|
|
|
|
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 */
|
2006-10-06 09:49:47 +00:00
|
|
|
if (ENABLE_FEATURE_REMOTE_LOG && !(option_mask32 & OPT_remotelog))
|
|
|
|
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 */
|
2007-01-04 17:57:54 +00:00
|
|
|
gethostname(localHostName, sizeof(localHostName));
|
|
|
|
p = strchr(localHostName, '.');
|
2006-09-30 19:20:00 +00:00
|
|
|
if (p) {
|
2003-09-10 23:35:45 +00:00
|
|
|
*p = '\0';
|
2000-02-08 19:58:47 +00:00
|
|
|
}
|
|
|
|
|
2006-10-06 09:49:47 +00:00
|
|
|
if (!(option_mask32 & OPT_nofork)) {
|
2006-05-31 10:19:51 +00:00
|
|
|
#ifdef BB_NOMMU
|
2003-12-15 21:57:44 +00:00
|
|
|
vfork_daemon_rexec(0, 1, argc, argv, "-n");
|
2006-05-31 10:19:51 +00:00
|
|
|
#else
|
2006-08-03 15:41:12 +00:00
|
|
|
xdaemon(0, 1);
|
2006-05-31 10:19:51 +00:00
|
|
|
#endif
|
2003-07-28 07:40:39 +00:00
|
|
|
}
|
2007-01-04 17:57:54 +00:00
|
|
|
umask(0);
|
|
|
|
do_syslogd();
|
2007-01-06 22:08:53 +00:00
|
|
|
/* return EXIT_SUCCESS; */
|
1999-11-25 07:30:46 +00:00
|
|
|
}
|