OK? diff --git sbin/slaacd/engine.c sbin/slaacd/engine.c index 394df48eeb6..5fecf6e8779 100644 --- sbin/slaacd/engine.c +++ sbin/slaacd/engine.c @@ -64,6 +64,8 @@ #include <netinet6/nd6.h> #include <netinet/icmp6.h> +#include <crypto/sha2.h> + #include <errno.h> #include <event.h> #include <imsg.h> @@ -180,6 +182,7 @@ struct address_proposal { uint8_t prefix_len; uint32_t vltime; uint32_t pltime; + uint8_t soiikey[SLAACD_SOIIKEY_LEN]; }; struct dfr_proposal { @@ -205,8 +208,10 @@ struct slaacd_iface { uint32_t if_index; int running; int autoconfprivacy; + int soii; struct ether_addr hw_address; struct sockaddr_in6 ll_address; + uint8_t soiikey[SLAACD_SOIIKEY_LEN]; LIST_HEAD(, radv) radvs; LIST_HEAD(, address_proposal) addr_proposals; LIST_HEAD(, dfr_proposal) dfr_proposals; @@ -615,12 +620,15 @@ engine_dispatch_main(int fd, short event, void *bula) iface->state = IF_DOWN; iface->autoconfprivacy = imsg_ifinfo.autoconfprivacy; + iface->soii = imsg_ifinfo.soii; memcpy(&iface->hw_address, &imsg_ifinfo.hw_address, sizeof(struct ether_addr)); memcpy(&iface->ll_address, &imsg_ifinfo.ll_address, sizeof(struct sockaddr_in6)); + memcpy(iface->soiikey, imsg_ifinfo.soiikey, + sizeof(iface->soiikey)); LIST_INIT(&iface->radvs); LIST_INSERT_HEAD(&slaacd_interfaces, iface, entries); @@ -635,6 +643,14 @@ engine_dispatch_main(int fd, short event, void *bula) imsg_ifinfo.autoconfprivacy; need_refresh = 1; } + + if (iface->soii != + imsg_ifinfo.soii) { + iface->soii = + imsg_ifinfo.soii; + need_refresh = 1; + } + if (memcmp(&iface->hw_address, &imsg_ifinfo.hw_address, sizeof(struct ether_addr)) != 0) { @@ -643,6 +659,14 @@ engine_dispatch_main(int fd, short event, void *bula) sizeof(struct ether_addr)); need_refresh = 1; } + if (memcmp(iface->soiikey, + imsg_ifinfo.soiikey, + sizeof(iface->soiikey)) != 0) { + memcpy(iface->soiikey, + imsg_ifinfo.soiikey, + sizeof(iface->soiikey)); + need_refresh = 1; + } if (iface->state != IF_DOWN && imsg_ifinfo.running && need_refresh) @@ -699,6 +723,7 @@ send_interface_info(struct slaacd_iface *iface, pid_t pid) cei.if_index = iface->if_index; cei.running = iface->running; cei.autoconfprivacy = iface->autoconfprivacy; + cei.soii = iface->soii; memcpy(&cei.hw_address, &iface->hw_address, sizeof(struct ether_addr)); memcpy(&cei.ll_address, &iface->ll_address, sizeof(struct sockaddr_in6)); @@ -1149,7 +1174,10 @@ void gen_addr(struct slaacd_iface *iface, struct radv_prefix *prefix, struct address_proposal *addr_proposal, int privacy) { + SHA2_CTX ctx; struct in6_addr priv_in6; + int dad_counter = 0; /* XXX not used */ + u_int8_t digest[SHA512_DIGEST_LENGTH]; /* from in6_ifadd() in nd6_rtr.c */ /* XXX from in6.h, guarded by #ifdef _KERNEL XXX nonstandard */ @@ -1196,20 +1224,33 @@ gen_addr(struct slaacd_iface *iface, struct radv_prefix *prefix, struct addr_proposal->addr.sin6_addr.s6_addr32[3] |= (priv_in6.s6_addr32[3] & ~addr_proposal->mask.s6_addr32[3]); } else { - addr_proposal->addr.sin6_addr.s6_addr32[0] |= - (iface->ll_address.sin6_addr.s6_addr32[0] & - ~addr_proposal->mask.s6_addr32[0]); - addr_proposal->addr.sin6_addr.s6_addr32[1] |= - (iface->ll_address.sin6_addr.s6_addr32[1] & - ~addr_proposal->mask.s6_addr32[1]); - addr_proposal->addr.sin6_addr.s6_addr32[2] |= - (iface->ll_address.sin6_addr.s6_addr32[2] & - ~addr_proposal->mask.s6_addr32[2]); - addr_proposal->addr.sin6_addr.s6_addr32[3] |= - (iface->ll_address.sin6_addr.s6_addr32[3] & - ~addr_proposal->mask.s6_addr32[3]); + if (iface->soii) { + SHA512Init(&ctx); + SHA512Update(&ctx, &prefix->prefix, + sizeof(prefix->prefix)); + SHA512Update(&ctx, &iface->hw_address, + sizeof(iface->hw_address)); + SHA512Update(&ctx, &dad_counter, sizeof(dad_counter)); + SHA512Update(&ctx, addr_proposal->soiikey, + sizeof(addr_proposal->soiikey)); + SHA512Final(digest, &ctx); + memcpy(&addr_proposal->addr.sin6_addr.s6_addr[8], + digest, 8); + } else { + addr_proposal->addr.sin6_addr.s6_addr32[0] |= + (iface->ll_address.sin6_addr.s6_addr32[0] & + ~addr_proposal->mask.s6_addr32[0]); + addr_proposal->addr.sin6_addr.s6_addr32[1] |= + (iface->ll_address.sin6_addr.s6_addr32[1] & + ~addr_proposal->mask.s6_addr32[1]); + addr_proposal->addr.sin6_addr.s6_addr32[2] |= + (iface->ll_address.sin6_addr.s6_addr32[2] & + ~addr_proposal->mask.s6_addr32[2]); + addr_proposal->addr.sin6_addr.s6_addr32[3] |= + (iface->ll_address.sin6_addr.s6_addr32[3] & + ~addr_proposal->mask.s6_addr32[3]); + } } - #undef s6_addr32 } @@ -1576,6 +1617,11 @@ void update_iface_ra(struct slaacd_iface *iface, struct radv *ra) sizeof(addr_proposal->hw_address)) != 0) continue; + if (memcmp(&addr_proposal->soiikey, + &iface->soiikey, + sizeof(addr_proposal->soiikey)) != 0) + continue; + if (addr_proposal->privacy) { /* * create new privacy address if old @@ -1716,6 +1762,8 @@ gen_address_proposal(struct slaacd_iface *iface, struct radv *ra, struct addr_proposal->if_index = iface->if_index; memcpy(&addr_proposal->hw_address, &iface->hw_address, sizeof(addr_proposal->hw_address)); + memcpy(&addr_proposal->soiikey, &iface->soiikey, + sizeof(addr_proposal->soiikey)); addr_proposal->privacy = privacy; memcpy(&addr_proposal->prefix, &prefix->prefix, sizeof(addr_proposal->prefix)); diff --git sbin/slaacd/frontend.c sbin/slaacd/frontend.c index 8bd49e2f1ad..9b74a9312cf 100644 --- sbin/slaacd/frontend.c +++ sbin/slaacd/frontend.c @@ -504,6 +504,7 @@ update_iface(uint32_t if_index, char* if_name) imsg_ifinfo.running = (flags & (IFF_UP | IFF_RUNNING)) == (IFF_UP | IFF_RUNNING); imsg_ifinfo.autoconfprivacy = !(xflags & IFXF_INET6_NOPRIVACY); + imsg_ifinfo.soii = !(xflags & IFXF_INET6_NOSOII); get_lladdr(if_name, &imsg_ifinfo.hw_address, &imsg_ifinfo.ll_address); memcpy(&nd_opt_source_link_addr, &imsg_ifinfo.hw_address, diff --git sbin/slaacd/slaacd.c sbin/slaacd/slaacd.c index 91cb9c143a2..8f75c66e59f 100644 --- sbin/slaacd/slaacd.c +++ sbin/slaacd/slaacd.c @@ -23,6 +23,7 @@ #include <sys/queue.h> #include <sys/socket.h> #include <sys/syslog.h> +#include <sys/sysctl.h> #include <sys/uio.h> #include <sys/wait.h> @@ -94,6 +95,7 @@ void configure_interface(struct imsg_configure_address *); void configure_gateway(struct imsg_configure_dfr *, uint8_t); void add_gateway(struct imsg_configure_dfr *); void delete_gateway(struct imsg_configure_dfr *); +int get_soiikey(uint8_t *); static int main_imsg_send_ipc_sockets(struct imsgbuf *, struct imsgbuf *); @@ -411,8 +413,11 @@ main_dispatch_frontend(int fd, short event, void *bula) fatal("%s: IMSG_UPDATE_IF wrong length: %d", __func__, imsg.hdr.len); memcpy(&imsg_ifinfo, imsg.data, sizeof(imsg_ifinfo)); - main_imsg_compose_engine(IMSG_UPDATE_IF, 0, - &imsg_ifinfo, sizeof(imsg_ifinfo)); + if (get_soiikey(imsg_ifinfo.soiikey) == -1) + log_warn("get_soiikey"); + else + main_imsg_compose_engine(IMSG_UPDATE_IF, 0, + &imsg_ifinfo, sizeof(imsg_ifinfo)); break; default: log_debug("%s: error handling imsg %d", __func__, @@ -784,3 +789,12 @@ delete_gateway(struct imsg_configure_dfr *dfr) { configure_gateway(dfr, RTM_DELETE); } + +int +get_soiikey(uint8_t *key) +{ + int mib[4] = {CTL_NET, PF_INET6, IPPROTO_IPV6, IPV6CTL_SOIIKEY}; + size_t size = SLAACD_SOIIKEY_LEN; + + return sysctl(mib, sizeof(mib) / sizeof(mib[0]), key, &size, NULL, 0); +} diff --git sbin/slaacd/slaacd.h sbin/slaacd/slaacd.h index ecc192ce1da..b9dfa00f312 100644 --- sbin/slaacd/slaacd.h +++ sbin/slaacd/slaacd.h @@ -27,6 +27,8 @@ #define SLAACD_MAXTEXT 256 #define SLAACD_MAXGROUPNAME 16 +#define SLAACD_SOIIKEY_LEN 16 + /* MAXDNAME from arpa/namesr.h */ #define SLAACD_MAX_DNSSL 1025 @@ -92,6 +94,7 @@ struct ctl_engine_info { uint32_t if_index; int running; int autoconfprivacy; + int soii; struct ether_addr hw_address; struct sockaddr_in6 ll_address; }; @@ -160,8 +163,10 @@ struct imsg_ifinfo { uint32_t if_index; int running; int autoconfprivacy; + int soii; struct ether_addr hw_address; struct sockaddr_in6 ll_address; + uint8_t soiikey[SLAACD_SOIIKEY_LEN]; }; struct imsg_del_addr { diff --git usr.sbin/slaacctl/slaacctl.c usr.sbin/slaacctl/slaacctl.c index 6668ab10d2b..e701a066ebf 100644 --- usr.sbin/slaacctl/slaacctl.c +++ usr.sbin/slaacctl/slaacctl.c @@ -193,7 +193,8 @@ show_interface_msg(struct imsg *imsg) printf("%s:\n", bufp != NULL ? bufp : "unknown"); printf("\t index: %3u ", cei->if_index); printf("running: %3s ", cei->running ? "yes" : "no"); - printf("privacy: %3s\n", cei->autoconfprivacy ? "yes" : "no"); + printf("privacy: %3s ", cei->autoconfprivacy ? "yes" : "no"); + printf("soii: %3s\n", cei->soii ? "yes" : "no"); printf("\tlladdr: %s\n", ether_ntoa(&cei->hw_address)); if (getnameinfo((struct sockaddr *)&cei->ll_address, cei->ll_address.sin6_len, hbuf, sizeof(hbuf), NULL, 0, -- 2.13.0
-- I'm not entirely sure you are real.