- 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");
- fflush(logfile);
- break;
- case LOGMODE_SYSLOG:
-#ifdef HAVE_SYSLOG_H
-#ifdef HAVE_VSYSLOG
- vsyslog(priority, format, ap);
+ if(len > 0 && (size_t)len < sizeof(message) - 1 && message[len - 1] == '\n') {
+ message[len - 1] = 0;
+ }
+
+ real_logger(level, priority, message);
+}
+
+static void sptps_logger(sptps_t *s, int s_errno, const char *format, va_list ap) {
+ (void)s_errno;
+ char message[1024];
+ size_t msglen = sizeof(message);
+
+ if(!should_log(DEBUG_ALWAYS)) {
+ return;
+ }
+
+ int len = vsnprintf(message, msglen, format, ap);
+ message[sizeof(message) - 1] = 0;
+
+ if(len > 0 && (size_t)len < sizeof(message) - 1) {
+ if(message[len - 1] == '\n') {
+ message[--len] = 0;
+ }
+
+ // WARNING: s->handle can point to a connection_t or a node_t,
+ // but both types have the name and hostname fields at the same offsets.
+ connection_t *c = s->handle;
+
+ if(c) {
+ snprintf(message + len, sizeof(message) - len, " from %s (%s)", c->name, c->hostname);
+ }
+ }
+
+ real_logger(DEBUG_ALWAYS, LOG_ERR, message);
+}
+
+void openlogger(const char *ident, logmode_t mode) {
+ logident = ident;
+ logmode = mode;
+
+ switch(mode) {
+ case LOGMODE_STDERR:
+ logpid = getpid();
+ break;
+
+ case LOGMODE_FILE:
+ logpid = getpid();
+ logfile = fopen(logfilename, "a");
+
+ if(!logfile) {
+ fprintf(stderr, "Could not open log file %s: %s\n", logfilename, strerror(errno));
+ logmode = LOGMODE_NULL;
+ }
+
+ break;
+
+ case LOGMODE_SYSLOG:
+#ifdef HAVE_MINGW
+ loghandle = RegisterEventSource(NULL, logident);
+
+ if(!loghandle) {
+ fprintf(stderr, "Could not open log handle!\n");
+ logmode = LOGMODE_NULL;
+ }
+
+ break;