diff options
| author | Florian Obser <florian@cvs.openbsd.org> | 2021-03-07 10:30:14 +0000 |
|---|---|---|
| committer | Florian Obser <florian@cvs.openbsd.org> | 2021-03-07 10:30:14 +0000 |
| commit | a940a26b0eeb392f3f95cb4f76b43a26b5d16c50 (patch) | |
| tree | e38c8ffb20a44983e3f2cf90ee987d4e1c59a9b2 | |
| parent | 95060ae74844b4191af24ea0be9ef8c98e967ca2 (diff) | |
No need to pass the link local and hw address around, we have it
already in the interface on the engine side.
| -rw-r--r-- | sbin/slaacd/engine.c | 5 | ||||
| -rw-r--r-- | sbin/slaacd/frontend.c | 4 | ||||
| -rw-r--r-- | sbin/slaacd/slaacd.h | 4 |
3 files changed, 4 insertions, 9 deletions
diff --git a/sbin/slaacd/engine.c b/sbin/slaacd/engine.c index 950020f1a83..4ed5fa6c350 100644 --- a/sbin/slaacd/engine.c +++ b/sbin/slaacd/engine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: engine.c,v 1.64 2021/03/07 10:29:12 florian Exp $ */ +/* $OpenBSD: engine.c,v 1.65 2021/03/07 10:30:13 florian Exp $ */ /* * Copyright (c) 2017 Florian Obser <florian@openbsd.org> @@ -727,8 +727,7 @@ engine_dispatch_main(int fd, short event, void *bula) &addr_proposal->uptime)) fatal("clock_gettime"); addr_proposal->if_index = imsg_addrinfo.if_index; - memcpy(&addr_proposal->hw_address, - &imsg_addrinfo.hw_address, + memcpy(&addr_proposal->hw_address, &iface->hw_address, sizeof(addr_proposal->hw_address)); addr_proposal->addr = imsg_addrinfo.addr; addr_proposal->mask = imsg_addrinfo.mask; diff --git a/sbin/slaacd/frontend.c b/sbin/slaacd/frontend.c index 0ab1ab110a8..ab4dba6841d 100644 --- a/sbin/slaacd/frontend.c +++ b/sbin/slaacd/frontend.c @@ -1,4 +1,4 @@ -/* $OpenBSD: frontend.c,v 1.49 2021/01/19 16:49:56 florian Exp $ */ +/* $OpenBSD: frontend.c,v 1.50 2021/03/07 10:30:13 florian Exp $ */ /* * Copyright (c) 2017 Florian Obser <florian@openbsd.org> @@ -562,8 +562,6 @@ update_autoconf_addresses(uint32_t if_index, char* if_name) memset(&imsg_addrinfo, 0, sizeof(imsg_addrinfo)); imsg_addrinfo.if_index = if_index; - get_lladdr(if_name, &imsg_addrinfo.hw_address, - &imsg_addrinfo.ll_address); memset(&imsg_link_state, 0, sizeof(imsg_link_state)); imsg_link_state.if_index = if_index; diff --git a/sbin/slaacd/slaacd.h b/sbin/slaacd/slaacd.h index 0e41d615d96..38de182af2b 100644 --- a/sbin/slaacd/slaacd.h +++ b/sbin/slaacd/slaacd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: slaacd.h,v 1.29 2021/02/27 10:28:12 florian Exp $ */ +/* $OpenBSD: slaacd.h,v 1.30 2021/03/07 10:30:13 florian Exp $ */ /* * Copyright (c) 2017 Florian Obser <florian@openbsd.org> @@ -169,8 +169,6 @@ struct ctl_engine_info_rdns_proposal { struct imsg_addrinfo { uint32_t if_index; - struct ether_addr hw_address; - struct sockaddr_in6 ll_address; struct sockaddr_in6 addr; struct in6_addr mask; int privacy; |