X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/b7164ab60bf28a93fc02bb65b784134fcbbc41c5..d613fd78298a9911b7917c06f3ea11de45462e76:/log.c

diff --git a/log.c b/log.c
index 9cd0572..95f01b6 100644
--- a/log.c
+++ b/log.c
@@ -15,6 +15,8 @@ uint32_t message_level=M_WARNING|M_ERR|M_SECURITY|M_FATAL;
 struct log_if *system_log=NULL;
 
 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 */
@@ -28,24 +30,10 @@ static void vMessageFallback(uint32_t class, const char *message, va_list args)
 
 static void vMessage(uint32_t class, const char *message, va_list args)
 {
-#define MESSAGE_BUFLEN 1023
-    static char buff[MESSAGE_BUFLEN+1]={0,};
-    size_t bp;
-    char *nlp;
 
     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,"%s",buff);
-	    memmove(buff,nlp+1,strlen(nlp+1)+1);
-	}
+	vslilog_part(system_log, class, message, args);
     } else {
 	vMessageFallback(class,message,args);
     }
@@ -61,6 +49,8 @@ void Message(uint32_t class, const char *message, ...)
 }
 
 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;
 
@@ -170,11 +160,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);
     }
 }
@@ -191,7 +181,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);
@@ -199,15 +189,6 @@ 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, ...)
-{
-    va_list ap;
-
-    va_start(ap,message);
-    log_vmulti(st,priority,message,ap);
-    va_end(ap);
-}
-
 struct log_if *init_log(list_t *ll)
 {
     int i=0;
@@ -242,8 +223,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->vlogfn=log_vmulti;
+    r->buff[0]=0;
     return r;
 }
 
@@ -284,6 +265,8 @@ static void logfile_vlog(void *sst, int class, const char *message,
 }
 
 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;
 
@@ -355,8 +338,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.vlogfn=logfile_vlog;
+    st->ops.buff[0]=0;
     st->loc=loc;
     st->f=NULL;
 
@@ -401,6 +384,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)
 {
     struct syslog *st=sst;
 
@@ -412,15 +398,6 @@ static void syslog_vlog(void *sst, int class, const char *message,
     }
 }
 
-static void syslog_log(void *sst, int priority, const char *message, ...)
-{
-    va_list ap;
-
-    va_start(ap,message);
-    syslog_vlog(sst,priority,message,ap);
-    va_end(ap);
-}
-
 static struct flagstr syslog_facility_table[]={
 #ifdef LOG_AUTH
     { "auth", LOG_AUTH },
@@ -472,8 +449,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.vlogfn=syslog_vlog;
+    st->ops.buff[0]=0;
 
     item=list_elem(args,0);
     if (!item || item->type!=t_dict)
@@ -508,9 +485,11 @@ static int log_from_fd_beforepoll(void *sst, struct pollfd *fds, int *nfds_io,
 {
     struct fdlog *st=sst;
     if (!st->finished) {
-	*nfds_io=1;
+	BEFOREPOLL_WANT_FDS(1);
 	fds[0].fd=st->fd;
 	fds[0].events=POLLIN;
+    } else {
+	BEFOREPOLL_WANT_FDS(0);
     }
     return 0;
 }
@@ -528,7 +507,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;
@@ -539,7 +518,7 @@ static void log_from_fd_afterpoll(void *sst, struct pollfd *fds, int nfds)
 	    for (i=0; i<st->i; 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);