diff options
| author |   florian <florian@openbsd.org> | 2018-07-20 20:35:00 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2018-07-20 20:35:00 +0000 |
| commit | ca3626e063279ce2ebed54acfccc1e785f630f20 (patch) | |
| tree | 8568b5d7e73f30834227794690839c1d6f9fc035 /usr.sbin/rad | |
| parent | Fix mem leaks on config reload: (diff) | |
| download | wireguard-openbsd-ca3626e063279ce2ebed54acfccc1e785f630f20.tar.xz wireguard-openbsd-ca3626e063279ce2ebed54acfccc1e785f630f20.zip | |
No need to copy rdns_lifetime around with an IMSG, it gets send to the
engine end frontend as part of ra_iface_conf.
Spotted after explaining to bket@ that a similar pattern is not needed
for the mtu option.
Diffstat (limited to 'usr.sbin/rad')
| -rw-r--r-- | usr.sbin/rad/engine.c | 5 | ||||
| -rw-r--r-- | usr.sbin/rad/frontend.c | 5 | ||||
| -rw-r--r-- | usr.sbin/rad/rad.c | 6 | ||||
| -rw-r--r-- | usr.sbin/rad/rad.h | 3 |
4 files changed, 4 insertions, 15 deletions
diff --git a/usr.sbin/rad/engine.c b/usr.sbin/rad/engine.c index 5d186439dd8..db31fb2a15b 100644 --- a/usr.sbin/rad/engine.c +++ b/usr.sbin/rad/engine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: engine.c,v 1.7 2018/07/15 09:28:21 florian Exp $ */ +/* $OpenBSD: engine.c,v 1.8 2018/07/20 20:35:00 florian Exp $ */ /* * Copyright (c) 2018 Florian Obser <florian@openbsd.org> @@ -355,9 +355,6 @@ engine_dispatch_main(int fd, short event, void *bula) SIMPLEQ_INSERT_TAIL(&ra_iface_conf->ra_prefix_list, ra_prefix_conf, entry); break; - case IMSG_RECONF_RA_RDNS_LIFETIME: - ra_iface_conf->rdns_lifetime = *((uint32_t *)imsg.data); - break; case IMSG_RECONF_RA_RDNSS: if ((ra_rdnss_conf = malloc(sizeof(struct ra_rdnss_conf))) == NULL) diff --git a/usr.sbin/rad/frontend.c b/usr.sbin/rad/frontend.c index afa4fb10859..e80879c67d5 100644 --- a/usr.sbin/rad/frontend.c +++ b/usr.sbin/rad/frontend.c @@ -1,4 +1,4 @@ -/* $OpenBSD: frontend.c,v 1.13 2018/07/20 20:33:29 florian Exp $ */ +/* $OpenBSD: frontend.c,v 1.14 2018/07/20 20:35:00 florian Exp $ */ /* * Copyright (c) 2018 Florian Obser <florian@openbsd.org> @@ -397,9 +397,6 @@ frontend_dispatch_main(int fd, short event, void *bula) SIMPLEQ_INSERT_TAIL(&ra_iface_conf->ra_prefix_list, ra_prefix_conf, entry); break; - case IMSG_RECONF_RA_RDNS_LIFETIME: - ra_iface_conf->rdns_lifetime = *((uint32_t *)imsg.data); - break; case IMSG_RECONF_RA_RDNSS: if ((ra_rdnss_conf = malloc(sizeof(struct ra_rdnss_conf))) == NULL) diff --git a/usr.sbin/rad/rad.c b/usr.sbin/rad/rad.c index 5343f9afda4..b741dd5120c 100644 --- a/usr.sbin/rad/rad.c +++ b/usr.sbin/rad/rad.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rad.c,v 1.11 2018/07/20 20:34:18 florian Exp $ */ +/* $OpenBSD: rad.c,v 1.12 2018/07/20 20:35:00 florian Exp $ */ /* * Copyright (c) 2018 Florian Obser <florian@openbsd.org> @@ -621,10 +621,6 @@ main_imsg_send_config(struct rad_conf *xconf) ra_prefix_conf, sizeof(*ra_prefix_conf)) == -1) return (-1); } - if (main_sendboth(IMSG_RECONF_RA_RDNS_LIFETIME, - &ra_iface_conf->rdns_lifetime, - sizeof(ra_iface_conf->rdns_lifetime)) == -1) - return (-1); SIMPLEQ_FOREACH(ra_rdnss_conf, &ra_iface_conf->ra_rdnss_list, entry) { if (main_sendboth(IMSG_RECONF_RA_RDNSS, ra_rdnss_conf, diff --git a/usr.sbin/rad/rad.h b/usr.sbin/rad/rad.h index b7b68d3a81f..3feeb80dca9 100644 --- a/usr.sbin/rad/rad.h +++ b/usr.sbin/rad/rad.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rad.h,v 1.13 2018/07/20 20:34:18 florian Exp $ */ +/* $OpenBSD: rad.h,v 1.14 2018/07/20 20:35:00 florian Exp $ */ /* * Copyright (c) 2018 Florian Obser <florian@openbsd.org> @@ -59,7 +59,6 @@ enum imsg_type { IMSG_RECONF_RA_IFACE, IMSG_RECONF_RA_AUTOPREFIX, IMSG_RECONF_RA_PREFIX, - IMSG_RECONF_RA_RDNS_LIFETIME, IMSG_RECONF_RA_RDNSS, IMSG_RECONF_RA_DNSSL, IMSG_RECONF_END, |