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)
{
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;
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);
}
}
va_end(ap);
}
+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));
{
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);
}
}
fflush(st->f);
}
} else {
- vMessage(class,message,args);
- Message(class,"\n");
+ vMessageFallback(class,message,args);
+ MessageFallback(class,"\n");
}
}
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 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) {
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;