X-Git-Url: http://www.average.org/gitweb/?p=psmb.git;a=blobdiff_plain;f=src%2Fpsmb_socket.c;h=634be8e4b3bfa7358f7fbf05268ed0cc76875871;hp=06b90a83f66f28674c0d0a3285bb1f4a2228affb;hb=df69e51a863610a5bfb6eee594418e0412954d8b;hpb=4f4539e776640bc1e7d04af3f0a0b3af4b75bfcd

diff --git a/src/psmb_socket.c b/src/psmb_socket.c
index 06b90a8..634be8e 100644
--- a/src/psmb_socket.c
+++ b/src/psmb_socket.c
@@ -1,4 +1,5 @@
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 #include <unistd.h>
 #include <sys/types.h>
@@ -8,6 +9,7 @@
 
 #include <psmb.h>
 #include "psmb_priv.h"
+#include "hash64.h"
 
 static void dummy_log(void *log_priv, int priority, const char *format, ...) {}
 
@@ -31,8 +33,8 @@ psmb_ctx_t *psmb_new_mm(void *(*malloc)(size_t size),
 		.fd = -1,
 		.malloc = malloc, .free = free, .realloc = realloc,
 		.logf = dummy_log,
-		.prefix = (struct in6_addr){{{	0xff, 0xff, 0x01, 0x05,
-						0xb0, 0x55, 0xff, 0xe7,
+		.prefix = (struct in6_addr){{{	0xff, 0x15,  'P',  'S',
+						 'M',  'B',  '0',  '1',
 						0x00, 0x00, 0x00, 0x00,
 						0x00, 0x00, 0x00, 0x00 }}},
 		.prefixlen = 64,
@@ -83,6 +85,12 @@ psmb_result_t psmb_set_port(psmb_ctx_t *ctx, unsigned short port)
 psmb_result_t psmb_set_mgrp(psmb_ctx_t *ctx, struct in6_addr prefix,
 	unsigned char prefixlen)
 {
+	if (prefixlen > 128) {
+		LOG(ctx, LOG_ERR, "psmb_set_mgrp() prefixlen %d is too big",
+				prefixlen);
+		errno = EINVAL;
+		return (psmb_result_t){PSMB_ERROR};
+	}
 	if (ctx->fd == -1) {
 		ctx->prefix = prefix;
 		ctx->prefixlen = prefixlen;
@@ -142,22 +150,41 @@ psmb_result_t psmb_open(psmb_ctx_t *ctx)
 		errno = sverr;
 		return (psmb_result_t){PSMB_ERROR};
 	}
+	/* TODO: set non-blocking */
 	return (psmb_result_t){PSMB_OK};
 }
 
+static struct in6_addr multiaddr(struct in6_addr prefix,
+		unsigned char prefixlen, uint64_t suffix)
+{
+	struct in6_addr result = prefix;
+	unsigned char len = prefixlen > 64 ? prefixlen : 64;
+	uint64_t mask = len == 64 ? ~(uint64_t)0 : ((uint64_t)1 << len) - 1;
+
+	*(uint64_t *)(&result.__in6_u.__u6_addr32[2]) &= ~mask;
+	*(uint64_t *)(&result.__in6_u.__u6_addr32[2]) |= (suffix & mask);
+	return result;
+}
+
 static psmb_result_t psmb_sub_unsub(psmb_ctx_t *ctx, char *channel, int option)
 {
 	struct ipv6_mreq mreq = { 0 };
+	char mgrp_str[INET6_ADDRSTRLEN+1];
 
 	if (ctx->fd == -1) {
 		LOG(ctx, LOG_ERR, "subscribe: psmb is not open");
 		errno = EINVAL;
 		return (psmb_result_t){PSMB_ERROR};
 	}
-	mreq.ipv6mr_multiaddr = ctx->prefix; /* use hash of the channel */
+	mreq.ipv6mr_multiaddr = multiaddr(ctx->prefix, ctx->prefixlen,
+			hash64(channel, strlen(channel)));
+	(void)inet_ntop(AF_INET6, &mreq.ipv6mr_multiaddr,
+			mgrp_str, sizeof(mgrp_str));
+	LOG(ctx, LOG_DEBUG, "using multiaddr %s for channel \"%s\"",
+			mgrp_str, channel);
 	mreq.ipv6mr_interface = 0; /* how to use this??? */
 	if (setsockopt(ctx->fd, IPPROTO_IPV6, option,
-		(void *)&mreq, sizeof(mreq)) == -1) {
+			(void *)&mreq, sizeof(mreq)) == -1) {
 		int sverr = errno;
 		LOG(ctx, LOG_ERR, "add_membership(): %m");
 		errno = sverr;
@@ -166,14 +193,72 @@ static psmb_result_t psmb_sub_unsub(psmb_ctx_t *ctx, char *channel, int option)
 	return (psmb_result_t){PSMB_OK};
 }
 
-psmb_result_t psmb_subscribe(psmb_ctx_t *ctx, char *channel) {
+psmb_result_t psmb_subscribe(psmb_ctx_t *ctx, char *channel)
+{
 	return psmb_sub_unsub(ctx, channel, IPV6_ADD_MEMBERSHIP);
 }
 
-psmb_result_t psmb_unsubscribe(psmb_ctx_t *ctx, char *channel) {
+psmb_result_t psmb_unsubscribe(psmb_ctx_t *ctx, char *channel)
+{
 	return psmb_sub_unsub(ctx, channel, IPV6_DROP_MEMBERSHIP);
 }
 
+psmb_result_t psmb_ev_rd(psmb_ctx_t *ctx)
+{
+	char buf[MAXBUFLEN];
+	char cmsgbuf[MAXBUFLEN];
+	struct iovec iov[1];
+	iov[0].iov_base=buf;
+	iov[0].iov_len=sizeof(buf);
+	struct cmsghdr *cmsg;
+	struct msghdr message;
+	message.msg_name=&their_addr;
+message.msg_namelen=sizeof(their_addr);
+message.msg_iov=iov;
+message.msg_iovlen=1;
+message.msg_control=cmsgbuf;
+message.msg_controllen=MAXBUFLEN;
+
+	if ((numbytes = recvmsg(sockfd, &message, 0)) == -1) {
+		/* error */ ;
+	}
+	for (cmsg = CMSG_FIRSTHDR(&message); cmsg != NULL; cmsg = CMSG_NXTHDR(&message, cmsg)) {
+		if (cmsg->cmsg_level != IPPROTO_IP || cmsg->cmsg_type != IP_PKTINFO)
+			continue;
+		struct in_pktinfo *pi = CMSG_DATA(cmsg);
+		addr = pi->ipi_spec_dst.s_addr;
+	}
+	
+
+	return (psmb_result_t){PSMB_OK};
+}
+
+psmb_result_t psmb_ev_wr(psmb_ctx_t *ctx)
+{
+	sock_opt_addr.s_addr = addr;
+	setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_IF, &sock_opt_addr, sizeof(sock_opt_addr));
+	sendto(sockfd, buffer, len, 0, (struct sockaddr *)&destination, sizeof destination);
+
+	return (psmb_result_t){PSMB_OK};
+}
+
+psmb_result_t psmb_ev_ex(psmb_ctx_t *ctx)
+{
+	return (psmb_result_t){PSMB_OK};
+}
+
+psmb_result_t psmb_publish(psmb_ctx_t *ctx, char *channel,
+	void *data, size_t size)
+{
+	return (psmb_result_t){PSMB_OK};
+}
+
+psmb_result_t psmb_get_message(psmb_ctx_t *ctx, char **channel,
+	void **data, size_t *size)
+{
+	return (psmb_result_t){PSMB_OK};
+}
+
 bool psmb_success(psmb_result_t result)
 {
 	return !(result.code & PSMB_ERROR);