reorder imsg_type enum so that we can #ifndef SMALL all the control

related imsg types

diff --git a/sbin/slaacd/slaacd.c b/sbin/slaacd/slaacd.c
index 238f893..4d0cb7a 100644 (file)
--- 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 3b78e6d..ba8a8cc 100644 (file)
--- 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,
 };