projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Configure events after obtaining a socket.
[tinc]
/
src
/
logger.c
diff --git
a/src/logger.c
b/src/logger.c
index
52a5bb2
..
8e73a6d
100644
(file)
--- a/
src/logger.c
+++ b/
src/logger.c
@@
-1,7
+1,7
@@
/*
logger.c -- logging code
/*
logger.c -- logging code
- Copyright (C) 200
3 Guus Sliepen <guus@sliepen.eu
.org>
- 200
3 Ivo Timmermans <ivo@o2w.nl>
+ Copyright (C) 200
4-2006 Guus Sliepen <guus@tinc-vpn
.org>
+ 200
4-2005 Ivo Timmermans
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,7
+17,7
@@
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.10 2003/08/17 09:04:00 guus Exp
$
+ $Id$
*/
#include "system.h"
*/
#include "system.h"
@@
-51,7
+51,7
@@
void openlogger(const char *ident, logmode_t mode) {
break;
case LOGMODE_SYSLOG:
#ifdef HAVE_MINGW
break;
case LOGMODE_SYSLOG:
#ifdef HAVE_MINGW
- loghandle =
OpenEventLog(NULL, identname
);
+ loghandle =
RegisterEventSource(NULL, logident
);
if(!loghandle)
logmode = LOGMODE_NULL;
break;
if(!loghandle)
logmode = LOGMODE_NULL;
break;
@@
-78,7
+78,7
@@
void logger(int priority, const char *format, ...) {
fflush(stderr);
break;
case LOGMODE_FILE:
fflush(stderr);
break;
case LOGMODE_FILE:
- fprintf(logfile, "%ld %s[%
d]: ", time(NULL), logident,
logpid);
+ fprintf(logfile, "%ld %s[%
ld]: ", time(NULL), logident, (long)
logpid);
vfprintf(logfile, format, ap);
fprintf(logfile, "\n");
fflush(logfile);
vfprintf(logfile, format, ap);
fprintf(logfile, "\n");
fflush(logfile);
@@
-87,8
+87,9
@@
void logger(int priority, const char *format, ...) {
#ifdef HAVE_MINGW
{
char message[4096];
#ifdef HAVE_MINGW
{
char message[4096];
+ char *messages[] = {message};
vsnprintf(message, sizeof(message), format, ap);
vsnprintf(message, sizeof(message), format, ap);
- ReportEvent(loghandle, priority, 0, 0, NULL, 1, 0,
&message
, NULL);
+ ReportEvent(loghandle, priority, 0, 0, NULL, 1, 0,
messages
, NULL);
}
#else
#ifdef HAVE_SYSLOG_H
}
#else
#ifdef HAVE_SYSLOG_H
@@
-118,7
+119,7
@@
void closelogger(void) {
break;
case LOGMODE_SYSLOG:
#ifdef HAVE_MINGW
break;
case LOGMODE_SYSLOG:
#ifdef HAVE_MINGW
-
CloseEventLog
(loghandle);
+
DeregisterEventSource
(loghandle);
break;
#else
#ifdef HAVE_SYSLOG_H
break;
#else
#ifdef HAVE_SYSLOG_H