diff options
| author |   florian <florian@openbsd.org> | 2021-01-19 16:54:48 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2021-01-19 16:54:48 +0000 |
| commit | 032fa6838b1e3c0ce81afbd366bbca83e0ea38c4 (patch) | |
| tree | 295b8285986118f1635efcb5509235e2f8cc92b7 | |
| parent | Move control_state and ctl_conns to control.c, it's not needed (diff) | |
| download | wireguard-openbsd-032fa6838b1e3c0ce81afbd366bbca83e0ea38c4.tar.xz wireguard-openbsd-032fa6838b1e3c0ce81afbd366bbca83e0ea38c4.zip | |
Make imsg event structs static to fix -fno-common.
Follows claudio's lead in ospfd et al.
Problem reported by mortimer.
| -rw-r--r-- | usr.sbin/rad/engine.c | 8 | ||||
| -rw-r--r-- | usr.sbin/rad/frontend.c | 6 | ||||
| -rw-r--r-- | usr.sbin/rad/rad.c | 16 |
3 files changed, 14 insertions, 16 deletions
diff --git a/usr.sbin/rad/engine.c b/usr.sbin/rad/engine.c index ef8506c1b7f..9a939830ea5 100644 --- a/usr.sbin/rad/engine.c +++ b/usr.sbin/rad/engine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: engine.c,v 1.17 2021/01/19 16:53:27 florian Exp $ */ +/* $OpenBSD: engine.c,v 1.18 2021/01/19 16:54:48 florian Exp $ */ /* * Copyright (c) 2018 Florian Obser <florian@openbsd.org> @@ -64,9 +64,9 @@ void remove_iface(uint32_t); struct engine_iface *find_engine_iface_by_id(uint32_t); void iface_timeout(int, short, void *); -struct rad_conf *engine_conf; -struct imsgev *iev_frontend; -struct imsgev *iev_main; +struct rad_conf *engine_conf; +static struct imsgev *iev_frontend; +static struct imsgev *iev_main; struct sockaddr_in6 all_nodes; void diff --git a/usr.sbin/rad/frontend.c b/usr.sbin/rad/frontend.c index 87a9f18a2dc..e6f6ae0419a 100644 --- a/usr.sbin/rad/frontend.c +++ b/usr.sbin/rad/frontend.c @@ -1,4 +1,4 @@ -/* $OpenBSD: frontend.c,v 1.38 2021/01/19 16:54:00 florian Exp $ */ +/* $OpenBSD: frontend.c,v 1.39 2021/01/19 16:54:48 florian Exp $ */ /* * Copyright (c) 2018 Florian Obser <florian@openbsd.org> @@ -151,8 +151,8 @@ void handle_route_message(struct rt_msghdr *, struct sockaddr **); struct rad_conf *frontend_conf; -struct imsgev *iev_main; -struct imsgev *iev_engine; +static struct imsgev *iev_main; +static struct imsgev *iev_engine; struct event ev_route; int ioctlsock = -1, routesock = -1; struct ipv6_mreq all_routers; diff --git a/usr.sbin/rad/rad.c b/usr.sbin/rad/rad.c index 0b578c24818..ad6d16adfe7 100644 --- a/usr.sbin/rad/rad.c +++ b/usr.sbin/rad/rad.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rad.c,v 1.25 2021/01/19 16:53:27 florian Exp $ */ +/* $OpenBSD: rad.c,v 1.26 2021/01/19 16:54:48 florian Exp $ */ /* * Copyright (c) 2018 Florian Obser <florian@openbsd.org> @@ -77,15 +77,13 @@ int main_sendboth(enum imsg_type, void *, uint16_t); void in6_prefixlen2mask(struct in6_addr *, int len); -struct rad_conf *main_conf; -struct imsgev *iev_frontend; -struct imsgev *iev_engine; +struct rad_conf *main_conf; +static struct imsgev *iev_frontend; +static struct imsgev *iev_engine; char *conffile; - -pid_t frontend_pid; -pid_t engine_pid; - -uint32_t cmd_opts; +pid_t frontend_pid; +pid_t engine_pid; +uint32_t cmd_opts; void main_sig_handler(int sig, short event, void *arg) |