X-Git-Url: http://www.average.org/gitweb/?p=psmb.git;a=blobdiff_plain;f=src%2Fpsmb_socket.c;h=4d263526362d5137f5c616d9a2658b8220d0b0dd;hp=a7c42efa9a6177443264731eff064ad6fe9bfcc4;hb=0e17b577419dd949124a0ca44c335c4ca929e928;hpb=0f3d787b19881c5d489ba476d1e5895df4f77084

diff --git a/src/psmb_socket.c b/src/psmb_socket.c
index a7c42ef..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) {
@@ -68,20 +86,26 @@ psmb_result_t psmb_open(psmb_ctx_t *ctx)
 	}
 	if (setsockopt(ctx->fd, SOL_SOCKET, SO_REUSEADDR,
 			&on, sizeof(on)) < 0) {
+		int sverr = errno;
 		close(ctx->fd);
 		ctx->fd = -1;
+		errno = sverr;
 		return (psmb_result_t){PSMB_ERROR};
 	}
 	if (setsockopt(ctx->fd, IPPROTO_IPV6, IPV6_PKTINFO,
 			&on, sizeof(on)) < 0) {
+		int sverr = errno;
 		close(ctx->fd);
 		ctx->fd = -1;
+		errno = sverr;
 		return (psmb_result_t){PSMB_ERROR};
 	}
 	if (bind(ctx->fd, (struct sockaddr *)&addr,
 			sizeof(struct sockaddr)) == -1) {
+		int sverr = errno;
 		close(ctx->fd);
 		ctx->fd = -1;
+		errno = sverr;
 		return (psmb_result_t){PSMB_ERROR};
 	}
 	return (psmb_result_t){PSMB_OK};