X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Flogger.c;h=78d629ee2e5305a57e812522e7bb79c04f5ed1d2;hb=2224a56ea44bffdafbe29ba7b74d1a0adb0cbd95;hp=eb63089017ca39b9d4be3990653ecc68582d1e4b;hpb=3d5dd72aa41f162fd5d4d6dd13f46c0fca5a14a9;p=meshlink

diff --git a/src/logger.c b/src/logger.c
index eb630890..78d629ee 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -1,6 +1,6 @@
 /*
     logger.c -- logging code
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014-2017 Guus Sliepen <guus@meshlink.io>
 
     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
@@ -20,32 +20,37 @@
 #include "system.h"
 
 #include "logger.h"
-
-debug_t debug_level = DEBUG_NOTHING;
-
-void logger(int level, int priority, const char *format, ...) {
-	if(level > debug_level)
-		return;
+#include "meshlink_internal.h"
+#include "sptps.h"
+
+// TODO: refactor logging code to use a meshlink_handle_t *.
+void logger(meshlink_handle_t *mesh, meshlink_log_level_t level, const char *format, ...) {
+	assert(format);
+
+	if(mesh) {
+		if(level < mesh->log_level || !mesh->log_cb) {
+			return;
+		}
+	} else {
+		if(level < global_log_level || !global_log_cb) {
+			return;
+		}
+	}
 
 	va_list ap;
 	char message[1024] = "";
 
 	va_start(ap, format);
-	int len = vsnprintf(message, sizeof message, format, ap);
+	int len = vsnprintf(message, sizeof(message), format, ap);
 	va_end(ap);
 
-	if(len > 0 && len < sizeof message && message[len - 1] == '\n')
-		message[len - 1] = 0;
-
-	fprintf(stderr, "%s\n", message);
-}
-
-// TODO: make sure this gets used somewhere
-static void sptps_logger(struct sptps *s, int s_errno, const char *format, va_list ap) {
-	char message[1024] = "";
-	int len = vsnprintf(message, sizeof message, format, ap);
-	if(len > 0 && len < sizeof message && message[len - 1] == '\n')
+	if(len > 0 && (size_t)len < sizeof(message) && message[len - 1] == '\n') {
 		message[len - 1] = 0;
+	}
 
-	fprintf(stderr, "%s\n", message);
+	if(mesh) {
+		mesh->log_cb(mesh, level, message);
+	} else {
+		global_log_cb(NULL, level, message);
+	}
 }