mirror of
https://github.com/sheumann/hush.git
synced 2024-10-27 07:28:31 +00:00
Vodz' last_patch57:
Ok. Patch with reduce size ready.
Notes: syslogd imposible close logsocket,
the real programm write logmessages (hmm, cycle loop?)
(Excuse me - this have small tab-formats rewroting also)
text data bss dec hex filename
2913 332 12388 15633 3d11 syslogd.o
3109 332 9252 12693 3195 syslogd_old.o
This commit is contained in:
Eric Andersen
parent
927c3bdc18
commit
871d93c462
@ -55,7 +55,7 @@
|
||||
#define __LOG_FILE "/var/log/messages"
|
||||
|
||||
/* Path to the unix socket */
|
||||
static char lfile[BUFSIZ];
|
||||
static char lfile[MAXPATHLEN];
|
||||
|
||||
static char *logFilePath = __LOG_FILE;
|
||||
|
||||
@ -63,7 +63,7 @@ static char *logFilePath = __LOG_FILE;
|
||||
static int MarkInterval = 20 * 60;
|
||||
|
||||
/* localhost's name */
|
||||
static char LocalHostName[32];
|
||||
static char LocalHostName[64];
|
||||
|
||||
#ifdef CONFIG_FEATURE_REMOTE_LOG
|
||||
#include <netinet/in.h>
|
||||
@ -78,9 +78,12 @@ static int doRemoteLog = FALSE;
|
||||
static int local_logging = FALSE;
|
||||
#endif
|
||||
|
||||
|
||||
#define MAXLINE 1024 /* maximum line length */
|
||||
|
||||
|
||||
/* circular buffer variables/structures */
|
||||
#ifdef CONFIG_FEATURE_IPC_SYSLOG
|
||||
|
||||
#if __GNU_LIBRARY__ < 5
|
||||
#error Sorry. Looks like you are using libc5.
|
||||
#error libc5 shm support isnt good enough.
|
||||
@ -129,6 +132,7 @@ static inline void sem_down(int semid)
|
||||
perror_msg_and_die("semop[SMwdn]");
|
||||
}
|
||||
|
||||
|
||||
void ipcsyslog_cleanup(void){
|
||||
printf("Exiting Syslogd!\n");
|
||||
if (shmid != -1)
|
||||
@ -260,7 +264,8 @@ void circ_message(const char *msg){
|
||||
}
|
||||
sem_up(s_semid);
|
||||
}
|
||||
#endif
|
||||
#endif /* CONFIG_FEATURE_IPC_SYSLOG */
|
||||
|
||||
/* Note: There is also a function called "message()" in init.c */
|
||||
/* Print a message to the log file. */
|
||||
static void message (char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
|
||||
@ -275,10 +280,10 @@ static void message (char *fmt, ...)
|
||||
fl.l_len = 1;
|
||||
|
||||
#ifdef CONFIG_FEATURE_IPC_SYSLOG
|
||||
if ((circular_logging) && (buf != NULL)){
|
||||
if ((circular_logging == TRUE) && (buf != NULL)){
|
||||
char b[1024];
|
||||
va_start (arguments, fmt);
|
||||
vsprintf (b, fmt, arguments);
|
||||
vsnprintf (b, sizeof(b)-1, fmt, arguments);
|
||||
va_end (arguments);
|
||||
circ_message(b);
|
||||
|
||||
@ -359,15 +364,14 @@ static const int IOV_COUNT = 2;
|
||||
|
||||
v->iov_base = msg;
|
||||
v->iov_len = strlen(msg);
|
||||
|
||||
writev_retry:
|
||||
if ( -1 == writev(remotefd,iov, IOV_COUNT)){
|
||||
if (errno == EINTR) goto writev_retry;
|
||||
error_msg_and_die("syslogd: cannot write to remote file handle on"
|
||||
error_msg_and_die("cannot write to remote file handle on"
|
||||
"%s:%d",RemoteHost,RemotePort);
|
||||
}
|
||||
}
|
||||
if (local_logging)
|
||||
if (local_logging == TRUE)
|
||||
#endif
|
||||
/* now spew out the message to wherever it is supposed to go */
|
||||
message("%s %s %s %s\n", timestamp, LocalHostName, res, msg);
|
||||
@ -396,7 +400,6 @@ static void domark(int sig)
|
||||
|
||||
/* This must be a #define, since when DODEBUG and BUFFERS_GO_IN_BSS are
|
||||
* enabled, we otherwise get a "storage size isn't constant error. */
|
||||
#define BUFSIZE 1023
|
||||
static int serveConnection (char* tmpbuf, int n_read)
|
||||
{
|
||||
char *p = tmpbuf;
|
||||
@ -404,16 +407,14 @@ static int serveConnection (char* tmpbuf, int n_read)
|
||||
while (p < tmpbuf + n_read) {
|
||||
|
||||
int pri = (LOG_USER | LOG_NOTICE);
|
||||
char line[ BUFSIZE + 1 ];
|
||||
char line[ MAXLINE + 1 ];
|
||||
unsigned char c;
|
||||
int gotpri = 0;
|
||||
|
||||
char *q = line;
|
||||
|
||||
while (p && (c = *p) && q < &line[ sizeof (line) - 1 ]) {
|
||||
if ((c == '<') && !gotpri && isdigit(p[1])) {
|
||||
while ( (c = *p) && q < &line[ sizeof (line) - 1 ]) {
|
||||
if (c == '<') {
|
||||
/* Parse the magic priority number. */
|
||||
gotpri = 1;
|
||||
pri = 0;
|
||||
while (isdigit (*(++p))) {
|
||||
pri = 10 * pri + (*p - '0');
|
||||
@ -441,7 +442,8 @@ static int serveConnection (char* tmpbuf, int n_read)
|
||||
|
||||
|
||||
#ifdef CONFIG_FEATURE_REMOTE_LOG
|
||||
static void init_RemoteLog (void){
|
||||
static void init_RemoteLog (void)
|
||||
{
|
||||
|
||||
struct sockaddr_in remoteaddr;
|
||||
struct hostent *hostinfo;
|
||||
@ -452,7 +454,7 @@ static void init_RemoteLog (void){
|
||||
remotefd = socket(AF_INET, SOCK_DGRAM, 0);
|
||||
|
||||
if (remotefd < 0) {
|
||||
error_msg_and_die("syslogd: cannot create socket");
|
||||
error_msg_and_die("cannot create socket");
|
||||
}
|
||||
|
||||
hostinfo = xgethostbyname(RemoteHost);
|
||||
@ -466,21 +468,18 @@ static void init_RemoteLog (void){
|
||||
for future operations
|
||||
*/
|
||||
if ( 0 != (connect(remotefd, (struct sockaddr *) &remoteaddr, len))){
|
||||
error_msg_and_die("syslogd: cannot connect to remote host %s:%d", RemoteHost, RemotePort);
|
||||
error_msg_and_die("cannot connect to remote host %s:%d", RemoteHost, RemotePort);
|
||||
}
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
#define MAXLINE 1024 /* maximum line length */
|
||||
|
||||
static void doSyslogd (void) __attribute__ ((noreturn));
|
||||
static void doSyslogd (void)
|
||||
{
|
||||
struct sockaddr_un sunx;
|
||||
socklen_t addrLength;
|
||||
|
||||
|
||||
int sock_fd;
|
||||
fd_set fds;
|
||||
|
||||
@ -513,65 +512,55 @@ static void doSyslogd (void)
|
||||
if (chmod (lfile, 0666) < 0)
|
||||
perror_msg_and_die ("Could not set permission on " _PATH_LOG);
|
||||
|
||||
FD_ZERO (&fds);
|
||||
FD_SET (sock_fd, &fds);
|
||||
|
||||
#ifdef CONFIG_FEATURE_IPC_SYSLOG
|
||||
if (circular_logging ){
|
||||
if (circular_logging == TRUE ){
|
||||
ipcsyslog_init();
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_FEATURE_REMOTE_LOG
|
||||
if (doRemoteLog){
|
||||
if (doRemoteLog == TRUE){
|
||||
init_RemoteLog();
|
||||
}
|
||||
#endif
|
||||
|
||||
logMessage (LOG_SYSLOG | LOG_INFO, "syslogd started: " BB_BANNER);
|
||||
logMessage (LOG_SYSLOG | LOG_INFO, "syslogd started: " CONFIG_BANNER);
|
||||
|
||||
for (;;) {
|
||||
|
||||
fd_set readfds;
|
||||
int n_ready;
|
||||
int fd;
|
||||
FD_ZERO (&fds);
|
||||
FD_SET (sock_fd, &fds);
|
||||
|
||||
memcpy (&readfds, &fds, sizeof (fds));
|
||||
|
||||
if ((n_ready = select (FD_SETSIZE, &readfds, NULL, NULL, NULL)) < 0) {
|
||||
if (errno == EINTR) continue; /* alarm may have happened. */
|
||||
if (select (sock_fd+1, &fds, NULL, NULL, NULL) < 0) {
|
||||
if (errno == EINTR) {
|
||||
/* alarm may have happened. */
|
||||
continue;
|
||||
}
|
||||
perror_msg_and_die ("select error");
|
||||
}
|
||||
|
||||
for (fd = 0; (n_ready > 0) && (fd < FD_SETSIZE); fd++) {
|
||||
if (FD_ISSET (fd, &readfds)) {
|
||||
|
||||
--n_ready;
|
||||
|
||||
if (fd == sock_fd) {
|
||||
if (FD_ISSET (sock_fd, &fds)) {
|
||||
int i;
|
||||
RESERVE_CONFIG_BUFFER(tmpbuf, BUFSIZE + 1);
|
||||
RESERVE_CONFIG_BUFFER(tmpbuf, BUFSIZ + 1);
|
||||
|
||||
memset(tmpbuf, '\0', BUFSIZE+1);
|
||||
if ( (i = recv(fd, tmpbuf, MAXLINE - 2, 0)) > 0) {
|
||||
if ( serveConnection(tmpbuf, i) <= 0 ) {
|
||||
close (fd);
|
||||
FD_CLR(fd, &fds);
|
||||
}
|
||||
memset(tmpbuf, '\0', BUFSIZ+1);
|
||||
if ( (i = recv(sock_fd, tmpbuf, BUFSIZ, 0)) > 0) {
|
||||
serveConnection(tmpbuf, i);
|
||||
} else {
|
||||
perror_msg_and_die ("UNIX socket error");
|
||||
}
|
||||
RELEASE_CONFIG_BUFFER (tmpbuf);
|
||||
} /* fd == sock_fd */
|
||||
}/* FD_ISSET() */
|
||||
}/* for */
|
||||
} /* for main loop */
|
||||
}
|
||||
|
||||
extern int syslogd_main(int argc, char **argv)
|
||||
{
|
||||
int opt;
|
||||
#if ! defined(__uClinux__)
|
||||
int doFork = TRUE;
|
||||
#endif
|
||||
|
||||
char *p;
|
||||
|
||||
@ -581,9 +570,11 @@ extern int syslogd_main(int argc, char **argv)
|
||||
case 'm':
|
||||
MarkInterval = atoi(optarg) * 60;
|
||||
break;
|
||||
#if ! defined(__uClinux__)
|
||||
case 'n':
|
||||
doFork = FALSE;
|
||||
break;
|
||||
#endif
|
||||
case 'O':
|
||||
logFilePath = xstrdup(optarg);
|
||||
break;
|
||||
@ -612,7 +603,7 @@ extern int syslogd_main(int argc, char **argv)
|
||||
|
||||
#ifdef CONFIG_FEATURE_REMOTE_LOG
|
||||
/* If they have not specified remote logging, then log locally */
|
||||
if (! doRemoteLog)
|
||||
if (doRemoteLog == FALSE)
|
||||
local_logging = TRUE;
|
||||
#endif
|
||||
|
||||
@ -625,14 +616,12 @@ extern int syslogd_main(int argc, char **argv)
|
||||
|
||||
umask(0);
|
||||
|
||||
if (doFork) {
|
||||
#if !defined(__UCLIBC__) || defined(__UCLIBC_HAS_MMU__)
|
||||
#if ! defined(__uClinux__)
|
||||
if (doFork == TRUE) {
|
||||
if (daemon(0, 1) < 0)
|
||||
perror_msg_and_die("daemon");
|
||||
#else
|
||||
error_msg_and_die("daemon not supported");
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
doSyslogd();
|
||||
|
||||
return EXIT_SUCCESS;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user