X-Git-Url: http://www.average.org/gitweb/?p=psmb.git;a=blobdiff_plain;f=src%2Fpsmb_socket.c;h=634be8e4b3bfa7358f7fbf05268ed0cc76875871;hp=28344a7a65c04138712f1dc5922a37e167a3b2e7;hb=df69e51a863610a5bfb6eee594418e0412954d8b;hpb=76aeb7bb2e18a6132d8935d15ae3b2f35728a8a7 diff --git a/src/psmb_socket.c b/src/psmb_socket.c index 28344a7..634be8e 100644 --- a/src/psmb_socket.c +++ b/src/psmb_socket.c @@ -1,12 +1,15 @@ #include +#include #include #include +#include #include #include #include #include #include "psmb_priv.h" +#include "hash64.h" static void dummy_log(void *log_priv, int priority, const char *format, ...) {} @@ -30,6 +33,11 @@ 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, 0x15, 'P', 'S', + 'M', 'B', '0', '1', + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }}}, + .prefixlen = 64, .pmtu = PSMB_DEFAULT_PMTU, .port = PSMB_DEFAULT_PORT}; return ctx; @@ -77,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; @@ -102,7 +116,7 @@ psmb_result_t psmb_open(psmb_ctx_t *ctx) 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"); @@ -118,7 +132,7 @@ psmb_result_t psmb_open(psmb_ctx_t *ctx) 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"); @@ -128,7 +142,7 @@ psmb_result_t psmb_open(psmb_ctx_t *ctx) 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); @@ -136,9 +150,130 @@ 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 = 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) { + int sverr = errno; + LOG(ctx, LOG_ERR, "add_membership(): %m"); + errno = sverr; + return (psmb_result_t){PSMB_ERROR}; + } + return (psmb_result_t){PSMB_OK}; +} + +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) +{ + 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); +} + +bool psmb_message_waiting(psmb_result_t result) +{ + return !!(result.code & PSMB_MESSAGE); +} + +bool psmb_need_write_wait(psmb_result_t result) +{ + return !!(result.code & PSMB_NEED_WRITE); +} + void psmb_destroy(psmb_ctx_t *ctx) { if (ctx->fd == -1) {