From 8613585e1f5a421cb88cfefa8307f2b3981df378 Mon Sep 17 00:00:00 2001
From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 12 Dec 2016 12:47:48 -0500
Subject: [PATCH] lib: Moved zapi message types to zclient.h

Move the data structure used to have knowledge about
the zapi message types to zclient.h where it belongs.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---
 lib/log.c     |  1 +
 lib/zclient.h | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/zebra.h   | 56 ---------------------------------------------------
 3 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/lib/log.c b/lib/log.c
index b8e505f347..a421f60443 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -24,6 +24,7 @@
 
 #include <zebra.h>
 
+#include "zclient.h"
 #include "log.h"
 #include "memory.h"
 #include "command.h"
diff --git a/lib/zclient.h b/lib/zclient.h
index ccb7b0509d..83b932f20a 100644
--- a/lib/zclient.h
+++ b/lib/zclient.h
@@ -37,6 +37,62 @@
 /* Zebra header size. */
 #define ZEBRA_HEADER_SIZE             8
 
+/* Zebra message types. */
+typedef enum {
+  ZEBRA_INTERFACE_ADD,
+  ZEBRA_INTERFACE_DELETE,
+  ZEBRA_INTERFACE_ADDRESS_ADD,
+  ZEBRA_INTERFACE_ADDRESS_DELETE,
+  ZEBRA_INTERFACE_UP,
+  ZEBRA_INTERFACE_DOWN,
+  ZEBRA_IPV4_ROUTE_ADD,
+  ZEBRA_IPV4_ROUTE_DELETE,
+  ZEBRA_IPV6_ROUTE_ADD,
+  ZEBRA_IPV6_ROUTE_DELETE,
+  ZEBRA_REDISTRIBUTE_ADD,
+  ZEBRA_REDISTRIBUTE_DELETE,
+  ZEBRA_REDISTRIBUTE_DEFAULT_ADD,
+  ZEBRA_REDISTRIBUTE_DEFAULT_DELETE,
+  ZEBRA_ROUTER_ID_ADD,
+  ZEBRA_ROUTER_ID_DELETE,
+  ZEBRA_ROUTER_ID_UPDATE,
+  ZEBRA_HELLO,
+  ZEBRA_NEXTHOP_REGISTER,
+  ZEBRA_NEXTHOP_UNREGISTER,
+  ZEBRA_NEXTHOP_UPDATE,
+  ZEBRA_INTERFACE_NBR_ADDRESS_ADD,
+  ZEBRA_INTERFACE_NBR_ADDRESS_DELETE,
+  ZEBRA_INTERFACE_BFD_DEST_UPDATE,
+  ZEBRA_IMPORT_ROUTE_REGISTER,
+  ZEBRA_IMPORT_ROUTE_UNREGISTER,
+  ZEBRA_IMPORT_CHECK_UPDATE,
+  ZEBRA_IPV4_ROUTE_IPV6_NEXTHOP_ADD,
+  ZEBRA_BFD_DEST_REGISTER,
+  ZEBRA_BFD_DEST_DEREGISTER,
+  ZEBRA_BFD_DEST_UPDATE,
+  ZEBRA_BFD_DEST_REPLAY,
+  ZEBRA_REDISTRIBUTE_IPV4_ADD,
+  ZEBRA_REDISTRIBUTE_IPV4_DEL,
+  ZEBRA_REDISTRIBUTE_IPV6_ADD,
+  ZEBRA_REDISTRIBUTE_IPV6_DEL,
+  ZEBRA_VRF_UNREGISTER,
+  ZEBRA_VRF_ADD,
+  ZEBRA_VRF_DELETE,
+  ZEBRA_INTERFACE_VRF_UPDATE,
+  ZEBRA_BFD_CLIENT_REGISTER,
+  ZEBRA_INTERFACE_ENABLE_RADV,
+  ZEBRA_INTERFACE_DISABLE_RADV,
+  ZEBRA_IPV4_NEXTHOP_LOOKUP_MRIB,
+  ZEBRA_INTERFACE_LINK_PARAMS,
+  ZEBRA_MPLS_LABELS_ADD,
+  ZEBRA_MPLS_LABELS_DELETE,
+  ZEBRA_IPV4_NEXTHOP_ADD,
+  ZEBRA_IPV4_NEXTHOP_DELETE,
+  ZEBRA_IPV6_NEXTHOP_ADD,
+  ZEBRA_IPV6_NEXTHOP_DELETE,
+  ZEBRA_IPMR_ROUTE_STATS,
+} zebra_message_types_t;
+
 struct redist_proto
 {
   u_char enabled;
diff --git a/lib/zebra.h b/lib/zebra.h
index 39f77ce3fe..19a26b5230 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -352,62 +352,6 @@ struct in_pktinfo
 /* default zebra TCP port for zclient */
 #define ZEBRA_PORT			2600
 
-/* Zebra message types. */
-typedef enum {
-  ZEBRA_INTERFACE_ADD,
-  ZEBRA_INTERFACE_DELETE,
-  ZEBRA_INTERFACE_ADDRESS_ADD,
-  ZEBRA_INTERFACE_ADDRESS_DELETE,
-  ZEBRA_INTERFACE_UP,
-  ZEBRA_INTERFACE_DOWN,
-  ZEBRA_IPV4_ROUTE_ADD,
-  ZEBRA_IPV4_ROUTE_DELETE,
-  ZEBRA_IPV6_ROUTE_ADD,
-  ZEBRA_IPV6_ROUTE_DELETE,
-  ZEBRA_REDISTRIBUTE_ADD,
-  ZEBRA_REDISTRIBUTE_DELETE,
-  ZEBRA_REDISTRIBUTE_DEFAULT_ADD,
-  ZEBRA_REDISTRIBUTE_DEFAULT_DELETE,
-  ZEBRA_ROUTER_ID_ADD,
-  ZEBRA_ROUTER_ID_DELETE,
-  ZEBRA_ROUTER_ID_UPDATE,
-  ZEBRA_HELLO,
-  ZEBRA_NEXTHOP_REGISTER,
-  ZEBRA_NEXTHOP_UNREGISTER,
-  ZEBRA_NEXTHOP_UPDATE,
-  ZEBRA_INTERFACE_NBR_ADDRESS_ADD,
-  ZEBRA_INTERFACE_NBR_ADDRESS_DELETE,
-  ZEBRA_INTERFACE_BFD_DEST_UPDATE,
-  ZEBRA_IMPORT_ROUTE_REGISTER,
-  ZEBRA_IMPORT_ROUTE_UNREGISTER,
-  ZEBRA_IMPORT_CHECK_UPDATE,
-  ZEBRA_IPV4_ROUTE_IPV6_NEXTHOP_ADD,
-  ZEBRA_BFD_DEST_REGISTER,
-  ZEBRA_BFD_DEST_DEREGISTER,
-  ZEBRA_BFD_DEST_UPDATE,
-  ZEBRA_BFD_DEST_REPLAY,
-  ZEBRA_REDISTRIBUTE_IPV4_ADD,
-  ZEBRA_REDISTRIBUTE_IPV4_DEL,
-  ZEBRA_REDISTRIBUTE_IPV6_ADD,
-  ZEBRA_REDISTRIBUTE_IPV6_DEL,
-  ZEBRA_VRF_UNREGISTER,
-  ZEBRA_VRF_ADD,
-  ZEBRA_VRF_DELETE,
-  ZEBRA_INTERFACE_VRF_UPDATE,
-  ZEBRA_BFD_CLIENT_REGISTER,
-  ZEBRA_INTERFACE_ENABLE_RADV,
-  ZEBRA_INTERFACE_DISABLE_RADV,
-  ZEBRA_IPV4_NEXTHOP_LOOKUP_MRIB,
-  ZEBRA_INTERFACE_LINK_PARAMS,
-  ZEBRA_MPLS_LABELS_ADD,
-  ZEBRA_MPLS_LABELS_DELETE,
-  ZEBRA_IPV4_NEXTHOP_ADD,
-  ZEBRA_IPV4_NEXTHOP_DELETE,
-  ZEBRA_IPV6_NEXTHOP_ADD,
-  ZEBRA_IPV6_NEXTHOP_DELETE,
-  ZEBRA_IPMR_ROUTE_STATS,
-} zebra_message_types_t;
-
 /* Marker value used in new Zserv, in the byte location corresponding
  * the command value in the old zserv header. To allow old and new
  * Zserv headers to be distinguished from each other.
-- 
2.39.5