summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorclaudio <claudio@openbsd.org>2021-01-19 09:46:51 +0000
committerclaudio <claudio@openbsd.org>2021-01-19 09:46:51 +0000
commit78c7f53f608e4e8ede41883269b564e8fa3bfcbf (patch)
treeac1a5f4f73f0c6e9768bfc34099d43fc77fb15fa
parentLike in ospfd use a static pkt_ptr buffer. (diff)
downloadwireguard-openbsd-78c7f53f608e4e8ede41883269b564e8fa3bfcbf.tar.xz
wireguard-openbsd-78c7f53f608e4e8ede41883269b564e8fa3bfcbf.zip
Properly define ospfd_process as an extern in the header file.
-rw-r--r--usr.sbin/ospf6d/ospf6d.c3
-rw-r--r--usr.sbin/ospf6d/ospf6d.h7
2 files changed, 6 insertions, 4 deletions
diff --git a/usr.sbin/ospf6d/ospf6d.c b/usr.sbin/ospf6d/ospf6d.c
index 4afe786eb41..7b06bc54710 100644
--- a/usr.sbin/ospf6d/ospf6d.c
+++ b/usr.sbin/ospf6d/ospf6d.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ospf6d.c,v 1.48 2020/09/16 20:50:10 remi Exp $ */
+/* $OpenBSD: ospf6d.c,v 1.49 2021/01/19 09:46:51 claudio Exp $ */
/*
* Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -64,6 +64,7 @@ int pipe_parent2ospfe[2];
int pipe_parent2rde[2];
int pipe_ospfe2rde[2];
+enum ospfd_process ospfd_process;
struct ospfd_conf *ospfd_conf = NULL;
struct imsgev *iev_ospfe;
struct imsgev *iev_rde;
diff --git a/usr.sbin/ospf6d/ospf6d.h b/usr.sbin/ospf6d/ospf6d.h
index ee00c55efa2..e9233b6484e 100644
--- a/usr.sbin/ospf6d/ospf6d.h
+++ b/usr.sbin/ospf6d/ospf6d.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ospf6d.h,v 1.49 2020/05/17 18:29:25 denis Exp $ */
+/* $OpenBSD: ospf6d.h,v 1.50 2021/01/19 09:46:51 claudio Exp $ */
/*
* Copyright (c) 2004, 2007 Esben Norby <norby@openbsd.org>
@@ -340,11 +340,12 @@ struct ifaddrchange {
};
/* ospf_conf */
-enum {
+enum ospfd_process {
PROC_MAIN,
PROC_OSPF_ENGINE,
PROC_RDE_ENGINE
-} ospfd_process;
+};
+extern enum ospfd_process ospfd_process;
#define REDIST_CONNECTED 0x01
#define REDIST_STATIC 0x02