Merge branch 'master' into feature/zebra-srcdest

1 files changed, 0 insertions, 64 deletions

diff --git a/lib/zebra.h b/lib/zebra.h
index bb43d062bc..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.
@@ -438,14 +382,6 @@ extern const char *zserv_command_string (unsigned int command);
 
 #define strmatch(a,b) (!strcmp((a), (b)))
 
-/* Error codes of zebra. */
-#define ZEBRA_ERR_NOERROR                0
-#define ZEBRA_ERR_RTEXIST               -1
-#define ZEBRA_ERR_RTUNREACH             -2
-#define ZEBRA_ERR_EPERM                 -3
-#define ZEBRA_ERR_RTNOEXIST             -4
-#define ZEBRA_ERR_KERNEL                -5
-
 /* Zebra message flags */
 #define ZEBRA_FLAG_INTERNAL           0x01
 #define ZEBRA_FLAG_SELFROUTE          0x02