X-Git-Url: http://www.average.org/gitweb/?p=psmb.git;a=blobdiff_plain;f=src%2Fpsmb_socket.c;h=538b87c9c766e6159240d05d5ce36757f3c9ac07;hp=c962651bc8ac21f19e7b61c63e9e815c590e1d2e;hb=a8e5ec1ed734952452dde1fba33cc7be206cb28b;hpb=20b696a4f530bab420be36972f6a19d36b0f7080

diff --git a/src/psmb_socket.c b/src/psmb_socket.c
index c962651..538b87c 100644
--- a/src/psmb_socket.c
+++ b/src/psmb_socket.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <unistd.h>
+#include <sys/types.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
@@ -20,8 +21,12 @@ psmb_ctx_t *psmb_new_mm(void *(*malloc)(size_t size),
 			void *(*realloc)(void *ptr, size_t size))
 {
 	psmb_ctx_t *ctx = (*malloc)(sizeof(psmb_ctx_t));
-	if (!ctx)
+	if (!ctx) {
+		int sverr = errno;
+		LOG(ctx, LOG_ERR, "failed to allocate psmb_ctx: %m");
+		errno = sverr;
 		return NULL;
+	}
 	*ctx = (psmb_ctx_t){
 		.fd = -1,
 		.malloc = malloc, .free = free, .realloc = realloc,
@@ -40,6 +45,7 @@ psmb_result_t psmb_set_logf(psmb_ctx_t *ctx,
 		ctx->log_priv = log_priv;
 		return (psmb_result_t){PSMB_OK};
 	} else {
+		LOG(ctx, LOG_ERR, "psmb_set_...() used after psmb_open()");
 		errno = EBUSY;
 		return (psmb_result_t){PSMB_ERROR};
 	}
@@ -51,6 +57,7 @@ psmb_result_t psmb_set_pmtu(psmb_ctx_t *ctx, unsigned int pmtu)
 		ctx->pmtu = pmtu;
 		return (psmb_result_t){PSMB_OK};
 	} else {
+		LOG(ctx, LOG_ERR, "psmb_set_...() used after psmb_open()");
 		errno = EBUSY;
 		return (psmb_result_t){PSMB_ERROR};
 	}
@@ -62,6 +69,7 @@ psmb_result_t psmb_set_port(psmb_ctx_t *ctx, unsigned short port)
 		ctx->port = port;
 		return (psmb_result_t){PSMB_OK};
 	} else {
+		LOG(ctx, LOG_ERR, "psmb_set_...() used after psmb_open()");
 		errno = EBUSY;
 		return (psmb_result_t){PSMB_ERROR};
 	}
@@ -75,6 +83,7 @@ psmb_result_t psmb_set_mgrp(psmb_ctx_t *ctx, struct in6_addr prefix,
 		ctx->prefixlen = prefixlen;
 		return (psmb_result_t){PSMB_OK};
 	} else {
+		LOG(ctx, LOG_ERR, "psmb_set_...() used after psmb_open()");
 		errno = EBUSY;
 		return (psmb_result_t){PSMB_ERROR};
 	}
@@ -90,32 +99,39 @@ psmb_result_t psmb_open(psmb_ctx_t *ctx)
 	};
 
 	if (ctx->fd != -1) {
+		LOG(ctx, LOG_ERR, "redundant call to psmb_open()");
 		errno = EBUSY;
 		return (psmb_result_t){PSMB_ERROR};
 	}
-	ctx->fd = socket(AF_INET6, SOCK_DGRAM, IPPROTO_IPV6);
+	ctx->fd = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
 	if (ctx->fd == -1) {
+		int sverr = errno;
+		LOG(ctx, LOG_ERR, "socket: %m");
+		errno = sverr;
 		return (psmb_result_t){PSMB_ERROR};
 	}
 	if (setsockopt(ctx->fd, SOL_SOCKET, SO_REUSEADDR,
 			&on, sizeof(on)) < 0) {
 		int sverr = errno;
+		LOG(ctx, LOG_ERR, "setsockopt(..., SO_REUSEADDR, ...): %m");
 		close(ctx->fd);
 		ctx->fd = -1;
 		errno = sverr;
 		return (psmb_result_t){PSMB_ERROR};
 	}
-	if (setsockopt(ctx->fd, IPPROTO_IPV6, IPV6_PKTINFO,
+	if (setsockopt(ctx->fd, IPPROTO_IPV6, IPV6_RECVPKTINFO,
 			&on, sizeof(on)) < 0) {
 		int sverr = errno;
+		LOG(ctx, LOG_ERR, "setsockopt(..., IPV6_PKTINFO, ...): %m");
 		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) {
+			sizeof(struct sockaddr_in6)) == -1) {
 		int sverr = errno;
+		LOG(ctx, LOG_ERR, "bind(): %m");
 		close(ctx->fd);
 		ctx->fd = -1;
 		errno = sverr;
@@ -123,3 +139,15 @@ psmb_result_t psmb_open(psmb_ctx_t *ctx)
 	}
 	return (psmb_result_t){PSMB_OK};
 }
+
+void psmb_destroy(psmb_ctx_t *ctx)
+{
+	if (ctx->fd == -1) {
+		LOG(ctx, LOG_ERR, "psmb_ctx is not open");
+	} else {
+		if (close(ctx->fd) == -1)
+			LOG(ctx, LOG_ERR, "close(): %m");
+	}
+	/* clean up the rest */
+	(*ctx->free)(ctx);
+}