summaryrefslogtreecommitdiff
path: root/sbin/slaacd
diff options
context:
space:
mode:
authorFlorian Obser <florian@cvs.openbsd.org>2017-07-06 14:57:30 +0000
committerFlorian Obser <florian@cvs.openbsd.org>2017-07-06 14:57:30 +0000
commit6b1f78b754167169036add2004f2fbeef3f8f8e6 (patch)
treeb4ce88364e367587093c35eef2ce71d8fed5945e /sbin/slaacd
parent5401fb4a63fe9e5c8d6209636b57560a535bc2a0 (diff)
reorder imsg_type enum so that we can #ifndef SMALL all the control
related imsg types
Diffstat (limited to 'sbin/slaacd')
-rw-r--r--sbin/slaacd/slaacd.c13
-rw-r--r--sbin/slaacd/slaacd.h12
2 files changed, 12 insertions, 13 deletions
diff --git a/sbin/slaacd/slaacd.c b/sbin/slaacd/slaacd.c
index 238f8935356..4d0cb7a95a5 100644
--- a/sbin/slaacd/slaacd.c
+++ b/sbin/slaacd/slaacd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: slaacd.c,v 1.2 2017/07/03 19:02:04 florian Exp $ */
+/* $OpenBSD: slaacd.c,v 1.3 2017/07/06 14:57:29 florian Exp $ */
/*
* Copyright (c) 2017 Florian Obser <florian@openbsd.org>
@@ -58,23 +58,22 @@ const char* imsg_type_name[] = {
"IMSG_CTL_SHOW_INTERFACE_INFO_RA_PREFIX",
"IMSG_CTL_SHOW_INTERFACE_INFO_RA_RDNS",
"IMSG_CTL_SHOW_INTERFACE_INFO_RA_DNSSL",
- "IMSG_CTL_SHOW_FRONTEND_INFO",
- "IMSG_CTL_SHOW_MAIN_INFO",
+ "IMSG_CTL_SHOW_INTERFACE_INFO_ADDR_PROPOSALS",
+ "IMSG_CTL_SHOW_INTERFACE_INFO_ADDR_PROPOSAL",
+ "IMSG_CTL_SHOW_INTERFACE_INFO_DFR_PROPOSALS",
+ "IMSG_CTL_SHOW_INTERFACE_INFO_DFR_PROPOSAL",
"IMSG_CTL_END",
+ "IMSG_CTL_SEND_SOLICITATION",
"IMSG_SOCKET_IPC",
"IMSG_STARTUP",
"IMSG_UPDATE_IF",
"IMSG_REMOVE_IF",
"IMSG_RA",
- "IMSG_CTL_SEND_SOLICITATION",
"IMSG_PROPOSAL",
"IMSG_PROPOSAL_ACK",
"IMSG_CONFIGURE_ADDRESS",
"IMSG_DEL_ADDRESS",
- "IMSG_CTL_SHOW_INTERFACE_INFO_ADDR_PROPOSAL",
"IMSG_FAKE_ACK",
- "IMSG_CTL_SHOW_INTERFACE_INFO_DFR_PROPOSALS",
- "IMSG_CTL_SHOW_INTERFACE_INFO_DFR_PROPOSAL",
"IMSG_CONFIGURE_DFR",
"IMSG_WITHDRAW_DFR",
};
diff --git a/sbin/slaacd/slaacd.h b/sbin/slaacd/slaacd.h
index 3b78e6d6e7e..ba8a8ccce3f 100644
--- a/sbin/slaacd/slaacd.h
+++ b/sbin/slaacd/slaacd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: slaacd.h,v 1.3 2017/07/06 14:56:39 florian Exp $ */
+/* $OpenBSD: slaacd.h,v 1.4 2017/07/06 14:57:29 florian Exp $ */
/*
* Copyright (c) 2017 Florian Obser <florian@openbsd.org>
@@ -51,22 +51,22 @@ enum imsg_type {
IMSG_CTL_SHOW_INTERFACE_INFO_RA_PREFIX,
IMSG_CTL_SHOW_INTERFACE_INFO_RA_RDNS,
IMSG_CTL_SHOW_INTERFACE_INFO_RA_DNSSL,
+ IMSG_CTL_SHOW_INTERFACE_INFO_ADDR_PROPOSALS,
+ IMSG_CTL_SHOW_INTERFACE_INFO_ADDR_PROPOSAL,
+ IMSG_CTL_SHOW_INTERFACE_INFO_DFR_PROPOSALS,
+ IMSG_CTL_SHOW_INTERFACE_INFO_DFR_PROPOSAL,
IMSG_CTL_END,
+ IMSG_CTL_SEND_SOLICITATION,
IMSG_SOCKET_IPC,
IMSG_STARTUP,
IMSG_UPDATE_IF,
IMSG_REMOVE_IF,
IMSG_RA,
- IMSG_CTL_SEND_SOLICITATION,
IMSG_PROPOSAL,
IMSG_PROPOSAL_ACK,
IMSG_CONFIGURE_ADDRESS,
IMSG_DEL_ADDRESS,
- IMSG_CTL_SHOW_INTERFACE_INFO_ADDR_PROPOSALS,
- IMSG_CTL_SHOW_INTERFACE_INFO_ADDR_PROPOSAL,
IMSG_FAKE_ACK,
- IMSG_CTL_SHOW_INTERFACE_INFO_DFR_PROPOSALS,
- IMSG_CTL_SHOW_INTERFACE_INFO_DFR_PROPOSAL,
IMSG_CONFIGURE_DFR,
IMSG_WITHDRAW_DFR,
};