From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 14 Sep 2016 19:57:31 +0000 (-0400)
Subject: lib: Make zebra messages types a enum
X-Git-Tag: frr-2.0-rc1~304
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b3d307ba4ac9657ccfc212cc6f9f7da8e6ceeccb;p=matthieu%2Ffrr.git

lib: Make zebra messages types a enum

The #define nature of zebra message types makes
it stupidly difficult to add /remove message
types.  Switch to enum

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
(cherry picked from commit 0d63e3c7df981f5b50f27789672f30987911a8cd)
---

diff --git a/lib/zebra.h b/lib/zebra.h
index fdfd471825..c2bb7123e6 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -396,57 +396,58 @@ struct in_pktinfo
 #define ZEBRA_PORT			2600
 
 /* Zebra message types. */
-#define ZEBRA_INTERFACE_ADD                1
-#define ZEBRA_INTERFACE_DELETE             2
-#define ZEBRA_INTERFACE_ADDRESS_ADD        3
-#define ZEBRA_INTERFACE_ADDRESS_DELETE     4
-#define ZEBRA_INTERFACE_UP                 5
-#define ZEBRA_INTERFACE_DOWN               6
-#define ZEBRA_IPV4_ROUTE_ADD               7
-#define ZEBRA_IPV4_ROUTE_DELETE            8
-#define ZEBRA_IPV6_ROUTE_ADD               9
-#define ZEBRA_IPV6_ROUTE_DELETE           10
-#define ZEBRA_REDISTRIBUTE_ADD            11
-#define ZEBRA_REDISTRIBUTE_DELETE         12
-#define ZEBRA_REDISTRIBUTE_DEFAULT_ADD    13
-#define ZEBRA_REDISTRIBUTE_DEFAULT_DELETE 14
-#define ZEBRA_IPV4_NEXTHOP_LOOKUP         15
-#define ZEBRA_IPV6_NEXTHOP_LOOKUP         16
-#define ZEBRA_IPV4_IMPORT_LOOKUP          17
-#define ZEBRA_IPV6_IMPORT_LOOKUP          18
-#define ZEBRA_INTERFACE_RENAME            19
-#define ZEBRA_ROUTER_ID_ADD               20
-#define ZEBRA_ROUTER_ID_DELETE            21
-#define ZEBRA_ROUTER_ID_UPDATE            22
-#define ZEBRA_HELLO                       23
-#define ZEBRA_NEXTHOP_REGISTER            24
-#define ZEBRA_NEXTHOP_UNREGISTER          25
-#define ZEBRA_NEXTHOP_UPDATE              26
-#define ZEBRA_INTERFACE_NBR_ADDRESS_ADD   27
-#define ZEBRA_INTERFACE_NBR_ADDRESS_DELETE 28
-#define ZEBRA_INTERFACE_BFD_DEST_UPDATE   29
-#define ZEBRA_IMPORT_ROUTE_REGISTER       30
-#define ZEBRA_IMPORT_ROUTE_UNREGISTER     31
-#define ZEBRA_IMPORT_CHECK_UPDATE         32
-#define ZEBRA_IPV4_ROUTE_IPV6_NEXTHOP_ADD 33
-#define ZEBRA_BFD_DEST_REGISTER           34
-#define ZEBRA_BFD_DEST_DEREGISTER         35
-#define ZEBRA_BFD_DEST_UPDATE             36
-#define ZEBRA_BFD_DEST_REPLAY             37
-#define ZEBRA_REDISTRIBUTE_IPV4_ADD       38
-#define ZEBRA_REDISTRIBUTE_IPV4_DEL       39
-#define ZEBRA_REDISTRIBUTE_IPV6_ADD       40
-#define ZEBRA_REDISTRIBUTE_IPV6_DEL       41
-#define ZEBRA_VRF_UNREGISTER              42
-#define ZEBRA_VRF_ADD                     43
-#define ZEBRA_VRF_DELETE                  44
-#define ZEBRA_INTERFACE_VRF_UPDATE        45
-#define ZEBRA_BFD_CLIENT_REGISTER         46
-#define ZEBRA_INTERFACE_ENABLE_RADV       47
-#define ZEBRA_INTERFACE_DISABLE_RADV      48
-#define ZEBRA_IPV4_NEXTHOP_LOOKUP_MRIB    49
-#define ZEBRA_INTERFACE_LINK_PARAMS       50
-#define ZEBRA_MESSAGE_MAX                 51
+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_IPV4_NEXTHOP_LOOKUP,
+  ZEBRA_IPV6_NEXTHOP_LOOKUP,
+  ZEBRA_IPV4_IMPORT_LOOKUP,
+  ZEBRA_IPV6_IMPORT_LOOKUP,
+  ZEBRA_INTERFACE_RENAME,
+  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_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