X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=log.c;h=d330113f0c1b8fe0255eab9ea60f87c37827686c;hp=32aed704b06e20e595ef366661426103fac6342f;hb=34d3bf4cdcb2d2938c3b92573f66815e4d9392ac;hpb=040ee979539e88ef71fb21a80d4a05d24961ae70 diff --git a/log.c b/log.c index 32aed70..d330113 100644 --- a/log.c +++ b/log.c @@ -8,37 +8,48 @@ #include #include #include "process.h" +#include "util.h" bool_t secnet_is_daemon=False; uint32_t message_level=M_WARNING|M_ERR|M_SECURITY|M_FATAL; struct log_if *system_log=NULL; -static void vMessage(uint32_t class, const char *message, va_list args) +static void vMessageFallback(uint32_t class, const char *message, va_list args) + FORMAT(printf,2,0); +static void vMessageFallback(uint32_t class, const char *message, va_list args) { FILE *dest=stdout; + /* Messages go to stdout/stderr */ + if (class & message_level) { + if (class&M_FATAL || class&M_ERR || class&M_WARNING) { + dest=stderr; + } + vfprintf(dest,message,args); + } +} + +static void vMessage(uint32_t class, const char *message, va_list args) +{ #define MESSAGE_BUFLEN 1023 static char buff[MESSAGE_BUFLEN+1]={0,}; - uint32_t bp; + size_t bp; char *nlp; - if (secnet_is_daemon) { + if (system_log) { /* Messages go to the system log interface */ bp=strlen(buff); + assert(bp < MESSAGE_BUFLEN); vsnprintf(buff+bp,MESSAGE_BUFLEN-bp,message,args); + buff[sizeof(buff)-2] = '\n'; + buff[sizeof(buff)-1] = '\0'; /* Each line is sent separately */ while ((nlp=strchr(buff,'\n'))) { *nlp=0; - slilog(system_log,class,buff); + slilog(system_log,class,"%s",buff); memmove(buff,nlp+1,strlen(nlp+1)+1); } } else { - /* Messages go to stdout/stderr */ - if (class & message_level) { - if (class&M_FATAL || class&M_ERR || class&M_WARNING) { - dest=stderr; - } - vfprintf(dest,message,args); - } + vMessageFallback(class,message,args); } } @@ -51,6 +62,17 @@ void Message(uint32_t class, const char *message, ...) va_end(ap); } +static void MessageFallback(uint32_t class, const char *message, ...) + FORMAT(printf,2,3); +static void MessageFallback(uint32_t class, const char *message, ...) +{ + va_list ap; + + va_start(ap,message); + vMessageFallback(class,message,ap); + va_end(ap); +} + static NORETURN(vfatal(int status, bool_t perror, const char *message, va_list args)); @@ -152,11 +174,11 @@ void cfgfile_postreadcheck(struct cloc loc, FILE *f) { assert(loc.file); if (ferror(f)) { - Message(M_FATAL, "error reading config file (%s): %s", + Message(M_FATAL, "error reading config file (%s): %s\n", loc.file, strerror(errno)); exit(current_phase); } else if (feof(f)) { - Message(M_FATAL, "unexpected end of config file (%s)", loc.file); + Message(M_FATAL, "unexpected end of config file (%s)\n", loc.file); exit(current_phase); } } @@ -173,7 +195,7 @@ static void log_vmulti(void *sst, int class, const char *message, va_list args) if (secnet_is_daemon) { for (i=st; i; i=i->next) { - i->l->vlog(i->l->st,class,message,args); + vslilog(i->l,class,message,args); } } else { vMessage(class,message,args); @@ -181,6 +203,8 @@ static void log_vmulti(void *sst, int class, const char *message, va_list args) } } +static void log_multi(void *st, int priority, const char *message, ...) + FORMAT(printf,3,4); static void log_multi(void *st, int priority, const char *message, ...) { va_list ap; @@ -224,8 +248,8 @@ struct log_if *init_log(list_t *ll) } r=safe_malloc(sizeof(*r), "init_log"); r->st=l; - r->log=log_multi; - r->vlog=log_vmulti; + r->logfn=log_multi; + r->vlogfn=log_vmulti; return r; } @@ -260,11 +284,13 @@ static void logfile_vlog(void *sst, int class, const char *message, fflush(st->f); } } else { - vMessage(class,message,args); - Message(class,"\n"); + vMessageFallback(class,message,args); + MessageFallback(class,"\n"); } } +static void logfile_log(void *state, int class, const char *message, ...) + FORMAT(printf,3,4); static void logfile_log(void *state, int class, const char *message, ...) { va_list ap; @@ -337,8 +363,8 @@ static list_t *logfile_apply(closure_t *self, struct cloc loc, dict_t *context, st->cl.apply=NULL; st->cl.interface=&st->ops; st->ops.st=st; - st->ops.log=logfile_log; - st->ops.vlog=logfile_vlog; + st->ops.logfn=logfile_log; + st->ops.vlogfn=logfile_vlog; st->loc=loc; st->f=NULL; @@ -381,6 +407,9 @@ static int msgclass_to_syslogpriority(uint32_t m) } } +static void syslog_vlog(void *sst, int class, const char *message, + va_list args) + FORMAT(printf,3,0); static void syslog_vlog(void *sst, int class, const char *message, va_list args) { @@ -389,11 +418,13 @@ static void syslog_vlog(void *sst, int class, const char *message, if (st->open) vsyslog(msgclass_to_syslogpriority(class),message,args); else { - vMessage(class,message,args); - Message(class,"\n"); + vMessageFallback(class,message,args); + MessageFallback(class,"\n"); } } +static void syslog_log(void *sst, int priority, const char *message, ...) + FORMAT(printf,3,4); static void syslog_log(void *sst, int priority, const char *message, ...) { va_list ap; @@ -454,8 +485,8 @@ static list_t *syslog_apply(closure_t *self, struct cloc loc, dict_t *context, st->cl.apply=NULL; st->cl.interface=&st->ops; st->ops.st=st; - st->ops.log=syslog_log; - st->ops.vlog=syslog_vlog; + st->ops.logfn=syslog_log; + st->ops.vlogfn=syslog_vlog; item=list_elem(args,0); if (!item || item->type!=t_dict) @@ -486,8 +517,7 @@ struct fdlog { }; static int log_from_fd_beforepoll(void *sst, struct pollfd *fds, int *nfds_io, - int *timeout_io, - const struct timeval *tv_now, uint64_t *now) + int *timeout_io) { struct fdlog *st=sst; if (!st->finished) { @@ -498,8 +528,7 @@ static int log_from_fd_beforepoll(void *sst, struct pollfd *fds, int *nfds_io, return 0; } -static void log_from_fd_afterpoll(void *sst, struct pollfd *fds, int nfds, - const struct timeval *tv_now, uint64_t *now) +static void log_from_fd_afterpoll(void *sst, struct pollfd *fds, int nfds) { struct fdlog *st=sst; int r,remain,i; @@ -512,7 +541,7 @@ static void log_from_fd_afterpoll(void *sst, struct pollfd *fds, int nfds, remain=FDLOG_BUFSIZE-st->i-1; if (remain<=0) { st->buffer[FDLOG_BUFSIZE-1]=0; - st->log->log(st->log,M_WARNING,"%s: overlong line: %s", + slilog(st->log,M_WARNING,"%s: overlong line: %s", st->prefix,st->buffer); st->i=0; remain=FDLOG_BUFSIZE-1; @@ -523,7 +552,7 @@ static void log_from_fd_afterpoll(void *sst, struct pollfd *fds, int nfds, for (i=0; ii; i++) { if (st->buffer[i]=='\n') { st->buffer[i]=0; - st->log->log(st->log->st,M_INFO,"%s: %s", + slilog(st->log,M_INFO,"%s: %s", st->prefix,st->buffer); i++; memmove(st->buffer,st->buffer+i,st->i-i); @@ -554,7 +583,6 @@ void log_from_fd(int fd, cstring_t prefix, struct log_if *log) prefix); } -init_module log_module; void log_module(dict_t *dict) { add_closure(dict,"logfile",logfile_apply);