projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct error message when remote host closed connection.
[tinc]
/
src
/
logger.c
diff --git
a/src/logger.c
b/src/logger.c
index
8029565
..
2421464
100644
(file)
--- a/
src/logger.c
+++ b/
src/logger.c
@@
-17,27
+17,22
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: logger.c,v 1.1.2.
2 2003/07/06 23:16:2
8 guus Exp $
+ $Id: logger.c,v 1.1.2.
9 2003/08/02 20:50:3
8 guus Exp $
*/
*/
-#include <stdio.h>
-#include <stdarg.h>
-#include <syslog.h>
-#include <unistd.h>
+#include "system.h"
#include "conf.h"
#include "logger.h"
#include "conf.h"
#include "logger.h"
-#include "system.h"
-
-volatile int debug_level = DEBUG_NOTHING;
-static int logmode = LOGMODE_STDERR;
+debug_t debug_level = DEBUG_NOTHING;
+static logmode_t logmode = LOGMODE_STDERR;
static pid_t logpid;
extern char *logfilename;
static FILE *logfile = NULL;
static const char *logident = NULL;
static pid_t logpid;
extern char *logfilename;
static FILE *logfile = NULL;
static const char *logident = NULL;
-void openlogger(const char *ident,
in
t mode) {
+void openlogger(const char *ident,
logmode_
t mode) {
logident = ident;
logmode = mode;
logident = ident;
logmode = mode;
@@
-52,23
+47,34
@@
void openlogger(const char *ident, int mode) {
logmode = LOGMODE_NULL;
break;
case LOGMODE_SYSLOG:
logmode = LOGMODE_NULL;
break;
case LOGMODE_SYSLOG:
+#ifdef HAVE_SYSLOG_H
openlog(logident, LOG_CONS | LOG_PID, LOG_DAEMON);
break;
openlog(logident, LOG_CONS | LOG_PID, LOG_DAEMON);
break;
+#endif
+ case LOGMODE_NULL:
+ break;
}
}
}
}
-void vlogger(int priority, const char *format, va_list ap) {
+void logger(int priority, const char *format, ...) {
+ va_list ap;
+
+ va_start(ap, format);
+
switch(logmode) {
case LOGMODE_STDERR:
vfprintf(stderr, format, ap);
fprintf(stderr, "\n");
switch(logmode) {
case LOGMODE_STDERR:
vfprintf(stderr, format, ap);
fprintf(stderr, "\n");
+ fflush(stderr);
break;
case LOGMODE_FILE:
fprintf(logfile, "%ld %s[%d]: ", time(NULL), logident, logpid);
vfprintf(logfile, format, ap);
fprintf(logfile, "\n");
break;
case LOGMODE_FILE:
fprintf(logfile, "%ld %s[%d]: ", time(NULL), logident, logpid);
vfprintf(logfile, format, ap);
fprintf(logfile, "\n");
+ fflush(logfile);
break;
case LOGMODE_SYSLOG:
break;
case LOGMODE_SYSLOG:
+#ifdef HAVE_SYSLOG_H
#ifdef HAVE_VSYSLOG
vsyslog(priority, format, ap);
#else
#ifdef HAVE_VSYSLOG
vsyslog(priority, format, ap);
#else
@@
-79,7
+85,12
@@
void vlogger(int priority, const char *format, va_list ap) {
}
#endif
break;
}
#endif
break;
+#endif
+ case LOGMODE_NULL:
+ break;
}
}
+
+ va_end(ap);
}
void closelogger(void) {
}
void closelogger(void) {
@@
-88,7
+99,13
@@
void closelogger(void) {
fclose(logfile);
break;
case LOGMODE_SYSLOG:
fclose(logfile);
break;
case LOGMODE_SYSLOG:
+#ifdef HAVE_SYSLOG_H
closelog();
break;
closelog();
break;
+#endif
+ case LOGMODE_NULL:
+ case LOGMODE_STDERR:
+ break;
+ break;
}
}
}
}