From: Eugene Crosser <crosser@average.org>
Date: Wed, 13 Mar 2019 08:27:57 +0000 (+0100)
Subject: add logging function
X-Git-Url: http://www.average.org/gitweb/?p=psmb.git;a=commitdiff_plain;h=0e17b577419dd949124a0ca44c335c4ca929e928

add logging function
---

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..62786d6
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,2 @@
+all:
+	make -C src all
diff --git a/include/psmb.h b/include/psmb.h
index 5092f6a..cc320e0 100644
--- a/include/psmb.h
+++ b/include/psmb.h
@@ -8,8 +8,11 @@ typedef struct _psmb_result psmb_result_t;
 
 psmb_ctx_t *psmb_new(void);
 psmb_ctx_t *psmb_new_mm(void *(*malloc)(size_t size),
-			void (*free)(void *ptr),
-			void *(*realloc)(void *ptr, size_t size));
+	void (*free)(void *ptr),
+	void *(*realloc)(void *ptr, size_t size));
+psmb_result_t psmb_set_logf(psmb_ctx_t *ctx,
+	void (*logf)(void *log_priv, int priority, const char *format, ...),
+	void *log_priv);
 psmb_result_t psmb_set_pmtu(psmb_ctx_t *ctx, unsigned int pmtu);
 psmb_result_t psmb_set_port(psmb_ctx_t *ctx, unsigned short pmtu);
 psmb_result_t psmb_set_mgrp(psmb_ctx_t *ctx, struct {unsigned char _uc[16];} pfx, unsigned char bits);
@@ -22,8 +25,8 @@ psmb_result_t psmb_ev_wr(psmb_ctx_t *ctx);
 psmb_result_t psmb_ev_ex(psmb_ctx_t *ctx);
 psmb_result_t psmb_subscribe(psmb_ctx_t *ctx, char *channel);
 psmb_result_t psmb_publish(psmb_ctx_t *ctx, char *channel,
-				void *data, size_t size);
+	void *data, size_t size);
 bool psmb_message(psmb_ctx_t *ctx, char **channel,
-				void **data, size_t *size);
+	void **data, size_t *size);
 
 #endif
diff --git a/src/Makefile b/src/Makefile
new file mode 100644
index 0000000..03469ce
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,7 @@
+CFLAGS = -pthread -Wall -I../include
+
+all: libpsmb.a
+
+libpsmb.a: psmb_socket.o
+
+psmb_socket.o: psmb_socket.c psmb_priv.h
diff --git a/src/psmb_priv.h b/src/psmb_priv.h
index 246ad3c..464665b 100644
--- a/src/psmb_priv.h
+++ b/src/psmb_priv.h
@@ -27,6 +27,8 @@ struct _psmb_ctx {
 	void *(*malloc)(size_t size);
 	void (*free)(void *ptr);
 	void *(*realloc)(void *ptr, size_t size);
+	void (*logf)(void *log_priv, int priority, const char *format, ...);
+	void *log_priv;
 	unsigned short port;
 	int pmtu;
 	/* subscription set here */
diff --git a/src/psmb_socket.c b/src/psmb_socket.c
index 660a563..4d26352 100644
--- a/src/psmb_socket.c
+++ b/src/psmb_socket.c
@@ -8,6 +8,8 @@
 #include <psmb.h>
 #include "psmb_priv.h"
 
+static void dummy_log(void *log_priv, int priority, const char *format, ...) {}
+
 psmb_ctx_t *psmb_new(void)
 {
 	return psmb_new_mm(malloc, free, realloc);
@@ -23,10 +25,26 @@ psmb_ctx_t *psmb_new_mm(void *(*malloc)(size_t size),
 	*ctx = (psmb_ctx_t){
 		.fd = -1,
 		.malloc = malloc, .free = free, .realloc = realloc,
-		.pmtu = PSMB_DEFAULT_PMTU, .port = PSMB_DEFAULT_PORT};
+		.logf = dummy_log,
+		.pmtu = PSMB_DEFAULT_PMTU,
+		.port = PSMB_DEFAULT_PORT};
 	return ctx;
 }
 
+psmb_result_t psmb_set_logf(psmb_ctx_t *ctx,
+	void (*logf)(void *log_priv, int priority, const char *format, ...),
+	void *log_priv)
+{
+	if (ctx->fd == -1) {
+		ctx->logf = logf;
+		ctx->log_priv = log_priv;
+		return (psmb_result_t){PSMB_OK};
+	} else {
+		errno = EBUSY;
+		return (psmb_result_t){PSMB_ERROR};
+	}
+}
+
 psmb_result_t psmb_set_pmtu(psmb_ctx_t *ctx, unsigned int pmtu)
 {
 	if (ctx->fd == -1) {