diff options
| author |   florian <florian@openbsd.org> | 2021-01-19 16:52:40 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2021-01-19 16:52:40 +0000 |
| commit | d81b02e2bf729ef7c64174c04b8906c20d59dcae (patch) | |
| tree | bce2dcc9ab9cc4445afdda563a3588c15302f5ea | |
| parent | Move control_state and ctl_conns to control.c, it's not needed (diff) | |
| download | wireguard-openbsd-d81b02e2bf729ef7c64174c04b8906c20d59dcae.tar.xz wireguard-openbsd-d81b02e2bf729ef7c64174c04b8906c20d59dcae.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-- | sbin/unwind/frontend.c | 6 | ||||
| -rw-r--r-- | sbin/unwind/resolver.c | 6 | ||||
| -rw-r--r-- | sbin/unwind/unwind.c | 21 |
3 files changed, 15 insertions, 18 deletions
diff --git a/sbin/unwind/frontend.c b/sbin/unwind/frontend.c index 31291194870..e563d9511c1 100644 --- a/sbin/unwind/frontend.c +++ b/sbin/unwind/frontend.c @@ -1,4 +1,4 @@ -/* $OpenBSD: frontend.c,v 1.63 2021/01/19 16:52:12 florian Exp $ */ +/* $OpenBSD: frontend.c,v 1.64 2021/01/19 16:52:40 florian Exp $ */ /* * Copyright (c) 2018 Florian Obser <florian@openbsd.org> @@ -148,8 +148,8 @@ void free_bl(void); int pending_query_cnt(void); struct uw_conf *frontend_conf; -struct imsgev *iev_main; -struct imsgev *iev_resolver; +static struct imsgev *iev_main; +static struct imsgev *iev_resolver; struct event ev_route; int udp4sock = -1, udp6sock = -1; int tcp4sock = -1, tcp6sock = -1; diff --git a/sbin/unwind/resolver.c b/sbin/unwind/resolver.c index c0af11d1069..f5a1f3e1f59 100644 --- a/sbin/unwind/resolver.c +++ b/sbin/unwind/resolver.c @@ -1,4 +1,4 @@ -/* $OpenBSD: resolver.c,v 1.130 2021/01/19 16:50:23 florian Exp $ */ +/* $OpenBSD: resolver.c,v 1.131 2021/01/19 16:52:40 florian Exp $ */ /* * Copyright (c) 2018 Florian Obser <florian@openbsd.org> @@ -197,8 +197,8 @@ int *resolvers_to_restart(struct uw_conf *, const char *query_imsg2str(struct query_imsg *); struct uw_conf *resolver_conf; -struct imsgev *iev_frontend; -struct imsgev *iev_main; +static struct imsgev *iev_frontend; +static struct imsgev *iev_main; struct uw_forwarder_head autoconf_forwarder_list; struct uw_resolver *resolvers[UW_RES_NONE]; int enabled_resolvers[UW_RES_NONE]; diff --git a/sbin/unwind/unwind.c b/sbin/unwind/unwind.c index dcb5be39adb..8cf1ab030ee 100644 --- a/sbin/unwind/unwind.c +++ b/sbin/unwind/unwind.c @@ -1,4 +1,4 @@ -/* $OpenBSD: unwind.c,v 1.55 2021/01/19 16:50:23 florian Exp $ */ +/* $OpenBSD: unwind.c,v 1.56 2021/01/19 16:52:40 florian Exp $ */ /* * Copyright (c) 2018 Florian Obser <florian@openbsd.org> @@ -75,17 +75,14 @@ void open_ports(void); void solicit_dns_proposals(void); void send_blocklist_fd(void); -struct uw_conf *main_conf; -struct imsgev *iev_frontend; -struct imsgev *iev_resolver; -char *conffile; - -pid_t frontend_pid; -pid_t resolver_pid; - -uint32_t cmd_opts; - -int routesock; +struct uw_conf *main_conf; +static struct imsgev *iev_frontend; +static struct imsgev *iev_resolver; +char *conffile; +pid_t frontend_pid; +pid_t resolver_pid; +uint32_t cmd_opts; +int routesock; void main_sig_handler(int sig, short event, void *arg) |