emo/sysklogd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

. Added support for TESTING define which will turn syslogd into

Browse Source 
stdio-mode used for debugging.

 . Reworked the initialization/fork code.  Now the parent process
   activates a signal handler which the daughter process will raise if
   it is initialized.  Only after that one the parent process may
   exit.  Otherwise klogd might try to flush its log cache while
   syslogd can't receive the messages yet.
This commit is contained in:
Joey Schulze 1998-10-12 11:35:02 +00:00
parent c924428cb7
commit cf7e986344
1 changed files with 109 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
syslogd.c
View File

@ -351,6 +351,17 @@ static char sccsid[] = "@(#)syslogd.c 5.27 (Berkeley) 10/10/88";
* Wed Feb 25 13:21:44 CET 1998: Martin Schulze <joey@infodrom.north.de> * Wed Feb 25 13:21:44 CET 1998: Martin Schulze <joey@infodrom.north.de>
* Corrected Topi's patch as it prevented forwarding during * Corrected Topi's patch as it prevented forwarding during
* startup due to an unknown LogPort. * startup due to an unknown LogPort.
*
* Sat Oct 10 20:01:48 CEST 1998: Martin Schulze <joey@infodrom.north.de>
* Added support for TESTING define which will turn syslogd into
* stdio-mode used for debugging.
*
* Sun Oct 11 20:16:59 CEST 1998: Martin Schulze <joey@infodrom.north.de>
* Reworked the initialization/fork code. Now the parent
* process activates a signal handler which the daughter process
* will raise if it is initialized. Only after that one the
* parent process may exit. Otherwise klogd might try to flush
* its log cache while syslogd can't receive the messages yet.
*/ */
@ -400,7 +411,9 @@ static char sccsid[] = "@(#)syslogd.c 5.27 (Berkeley) 10/10/88";
#include <arpa/nameser.h> #include <arpa/nameser.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <resolv.h> #include <resolv.h>
#ifndef TESTING
#include "pidfile.h" #include "pidfile.h"
#endif
#include "version.h" #include "version.h"
#if defined(__linux__) #if defined(__linux__)
@ -655,6 +668,9 @@ void domark();
void debug_switch(); void debug_switch();
void logerror(char *type); void logerror(char *type);
void die(int sig); void die(int sig);
#ifndef TESTING
void doexit(int sig);
#endif
void init(); void init();
void cfline(char *line, register struct filed *f); void cfline(char *line, register struct filed *f);
int decode(char *name, struct code *codetab); int decode(char *name, struct code *codetab);
@ -681,11 +697,14 @@ int main(argc, argv)
#if !defined(__GLIBC__) #if !defined(__GLIBC__)
int len, num_fds; int len, num_fds;
#else /* __GLIBC__ */ #else /* __GLIBC__ */
#ifndef TESTING
size_t len; size_t len;
#endif
int num_fds; int num_fds;
#endif /* __GLIBC__ */ #endif /* __GLIBC__ */
fd_set unixm, readfds; fd_set unixm, readfds;
#ifndef TESTING
int fd; int fd;
#ifdef SYSLOG_UNIXAF #ifdef SYSLOG_UNIXAF
struct sockaddr_un fromunix; struct sockaddr_un fromunix;
@ -693,6 +712,8 @@ int main(argc, argv)
#ifdef SYSLOG_INET #ifdef SYSLOG_INET
struct sockaddr_in frominet; struct sockaddr_in frominet;
char *from; char *from;
#endif
pid_t ppid = getpid();
#endif #endif
int ch; int ch;
struct hostent *hent; struct hostent *hent;
@ -701,7 +722,9 @@ int main(argc, argv)
extern int optind; extern int optind;
extern char *optarg; extern char *optarg;
#ifndef TESTING
chdir ("/"); chdir ("/");
#endif
while ((ch = getopt(argc, argv, "dhf:l:m:np:rs:v")) != EOF) while ((ch = getopt(argc, argv, "dhf:l:m:np:rs:v")) != EOF)
switch((char)ch) { switch((char)ch) {
case 'd': /* debug */ case 'd': /* debug */
@ -751,16 +774,28 @@ int main(argc, argv)
if (argc -= optind) if (argc -= optind)
usage(); usage();
#ifndef TESTING
if ( !(Debug || NoFork) ) if ( !(Debug || NoFork) )
{ {
dprintf("Checking pidfile.\n"); dprintf("Checking pidfile.\n");
if (!check_pid(PidFile)) if (!check_pid(PidFile))
{ {
if (fork()) if (fork()) {
/* /*
* Parent process * Parent process
*/ */
exit(0); signal (SIGTERM, doexit);
sleep(300);
/*
* Not reached unless something major went wrong. 5
* minutes should be a fair amount of time to wait.
* Please note that this procedure is important since
* the father must not exit before syslogd isn't
* initialized or the klogd won't be able to flush its
* logs. -Joey
*/
exit(1);
}
num_fds = getdtablesize(); num_fds = getdtablesize();
for (i= 0; i < num_fds; i++) for (i= 0; i < num_fds; i++)
(void) close(i); (void) close(i);
@ -773,12 +808,14 @@ int main(argc, argv)
} }
} }
else else
#endif
debugging_on = 1; debugging_on = 1;
#ifndef SYSV #ifndef SYSV
else else
setlinebuf(stdout); setlinebuf(stdout);
#endif #endif
#ifndef TESTING
/* tuck my process id away */ /* tuck my process id away */
if ( !Debug ) if ( !Debug )
{ {
@ -797,6 +834,7 @@ int main(argc, argv)
exit(1); exit(1);
} }
} /* if ( !Debug ) */ } /* if ( !Debug ) */
#endif
consfile.f_type = F_CONSOLE; consfile.f_type = F_CONSOLE;
(void) strcpy(consfile.f_un.f_fname, ctty); (void) strcpy(consfile.f_un.f_fname, ctty);
@ -861,11 +899,18 @@ int main(argc, argv)
dprintf("Starting.\n"); dprintf("Starting.\n");
init(); init();
#ifndef TESTING
if ( Debug ) if ( Debug )
{ {
dprintf("Debugging disabled, SIGUSR1 to turn on debugging.\n"); dprintf("Debugging disabled, SIGUSR1 to turn on debugging.\n");
debugging_on = 0; debugging_on = 0;
} }
/*
* Send a signal to the parent to it can terminate.
*/
if (getpid() != ppid)
kill (ppid, SIGTERM);
#endif
/* Main loop begins here. */ /* Main loop begins here. */
FD_ZERO(&unixm); FD_ZERO(&unixm);
@ -874,16 +919,21 @@ int main(argc, argv)
int nfds; int nfds;
errno = 0; errno = 0;
#ifdef SYSLOG_UNIXAF #ifdef SYSLOG_UNIXAF
#ifndef TESTING
/* /*
* Add the Unix Domain Socket to the list of read * Add the Unix Domain Socket to the list of read
* descriptors. * descriptors.
*/ */
if (funix >= 0) {
FD_SET(funix, &readfds); FD_SET(funix, &readfds);
for (nfds= 0; nfds < FD_SETSIZE; ++nfds) for (nfds= 0; nfds < FD_SETSIZE; ++nfds)
if ( FD_ISSET(nfds, &unixm) ) if ( FD_ISSET(nfds, &unixm) )
FD_SET(nfds, &readfds); FD_SET(nfds, &readfds);
}
#endif
#endif #endif
#ifdef SYSLOG_INET #ifdef SYSLOG_INET
#ifndef TESTING
/* /*
* Add the Internet Domain Socket to the list of read * Add the Internet Domain Socket to the list of read
* descriptors. * descriptors.
@ -893,6 +943,11 @@ int main(argc, argv)
dprintf("Listening on syslog UDP port.\n"); dprintf("Listening on syslog UDP port.\n");
} }
#endif #endif
#endif
#ifdef TESTING
FD_SET(fileno(stdin), &readfds);
dprintf("Listening on stdin. Press Ctrl-C to interrupt.\n");
#endif
if ( debugging_on ) if ( debugging_on )
{ {
@ -932,6 +987,7 @@ int main(argc, argv)
dprintf(("\n")); dprintf(("\n"));
} }
#ifndef TESTING
#ifdef SYSLOG_UNIXAF #ifdef SYSLOG_UNIXAF
if ( debugging_on ) if ( debugging_on )
{ {
@ -1014,6 +1070,24 @@ int main(argc, argv)
sleep(10); sleep(10);
} }
} }
#endif
#else
if ( FD_ISSET(fileno(stdin), &readfds) ) {
dprintf("Message from stdin.\n");
memset(line, '\0', sizeof(line));
line[0] = '.';
parts[fileno(stdin)] = (char *) 0;
i = read(fileno(stdin), line, MAXLINE);
if (i > 0) {
printchopped(LocalHostName, line, i+1, fileno(stdin));
} else if (i < 0) {
if (errno != EINTR) {
logerror("stdin");
}
}
FD_CLR(fileno(stdin), &readfds);
}
#endif #endif
} }
} }
@ -1976,10 +2050,23 @@ void die(sig)
/* Clean-up files. */ /* Clean-up files. */
(void) unlink(LogName); (void) unlink(LogName);
#ifndef TESTING
(void) remove_pid(PidFile); (void) remove_pid(PidFile);
#endif
exit(0); exit(0);
} }
/*
* Signal handler to terminate the parent process.
*/
#ifndef TESTING
void doexit(sig)
int sig;
{
exit (0);
}
#endif
/* /*
* INIT -- Initialize syslogd from configuration table * INIT -- Initialize syslogd from configuration table
*/ */
@ -1988,7 +2075,12 @@ void init()
{ {
register int i, lognum; register int i, lognum;
register FILE *cf; register FILE *cf;
register struct filed *f, **nextp = (struct filed **) 0; register struct filed *f;
#ifndef TESTING
#ifndef SYSV
register struct filed **nextp = (struct filed **) 0;
#endif
#endif
register char *p; register char *p;
register unsigned int Forwarding = 0; register unsigned int Forwarding = 0;
#ifdef CONT_LINE #ifdef CONT_LINE
@ -2044,11 +2136,24 @@ void init()
} }
#ifdef SYSV
lognum = 0;
#else
f = NULL;
#endif
/* open the configuration file */ /* open the configuration file */
if ((cf = fopen(ConfFile, "r")) == NULL) { if ((cf = fopen(ConfFile, "r")) == NULL) {
dprintf("cannot open %s.\n", ConfFile); dprintf("cannot open %s.\n", ConfFile);
#ifdef SYSV #ifdef SYSV
cfline("*.ERR\t" _PATH_CONSOLE, *nextp); allocate_log();
f = &Files[lognum++];
#ifndef TESTING
cfline("*.err\t" _PATH_CONSOLE, f);
#else
snprintf(cbuf,sizeof(cbuf), "*.*\t%s", ttyname(0));
cfline(cbuf, f);
#endif
#else #else
*nextp = (struct filed *)calloc(1, sizeof(*f)); *nextp = (struct filed *)calloc(1, sizeof(*f));
cfline("*.ERR\t" _PATH_CONSOLE, *nextp); cfline("*.ERR\t" _PATH_CONSOLE, *nextp);
@ -2062,11 +2167,6 @@ void init()
/* /*
* Foreach line in the conf table, open that file. * Foreach line in the conf table, open that file.
*/ */
#ifdef SYSV
lognum = 0;
#else
f = NULL;
#endif
#if CONT_LINE #if CONT_LINE
cline = cbuf; cline = cbuf;
while (fgets(cline, sizeof(cbuf) - (cline - cbuf), cf) != NULL) { while (fgets(cline, sizeof(cbuf) - (cline - cbuf), cf) != NULL) {