summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2019-06-02 15:24:19 -0400
committerDonald Sharp <sharpd@cumulusnetworks.com>2019-06-02 16:07:48 -0400
commitda01a37a1bdf54cc30e3bf64bc99f090a0241d02 (patch)
tree8172b6103f67e605f45f3a60bec7169172a53baa
parent770835713182ee2a7797e2147bb7f12813280b5a (diff)
lib: Move zclient flags to zclient.h
zebra.h had some defined flags that were being used as part of the route encode/decode functionality. These belong in the zclient.h code. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
-rw-r--r--lib/zclient.h35
-rw-r--r--lib/zebra.h38
2 files changed, 35 insertions, 38 deletions
diff --git a/lib/zclient.h b/lib/zclient.h
index c61c8d4226..5f529dcb69 100644
--- a/lib/zclient.h
+++ b/lib/zclient.h
@@ -322,6 +322,41 @@ struct zapi_route {
unsigned short instance;
uint32_t flags;
+/*
+ * Cause Zebra to consider this routes nexthops recursively
+ */
+#define ZEBRA_FLAG_ALLOW_RECURSION 0x01
+/*
+ * This is a route that is read in on startup that was left around
+ * from a previous run of FRR
+ */
+#define ZEBRA_FLAG_SELFROUTE 0x02
+/*
+ * This flag is used to tell Zebra that the BGP route being passed
+ * down is a IBGP route
+ */
+#define ZEBRA_FLAG_IBGP 0x04
+/*
+ * This is a route that has been selected for FIB installation.
+ * This flag is set in zebra and can be passed up to routing daemons
+ */
+#define ZEBRA_FLAG_SELECTED 0x08
+/*
+ * This is a route that we are telling Zebra that this route *must*
+ * win and will be installed even over ZEBRA_FLAG_SELECTED
+ */
+#define ZEBRA_FLAG_FIB_OVERRIDE 0x10
+/*
+ * This flag tells Zebra that the route is a EVPN route and should
+ * be treated specially
+ */
+#define ZEBRA_FLAG_EVPN_ROUTE 0x20
+/*
+ * This flag tells Zebra that it should treat the distance passed
+ * down as an additional discriminator for route selection of the
+ * route entry. This mainly is used for backup static routes.
+ */
+#define ZEBRA_FLAG_RR_USE_DISTANCE 0x40
uint8_t message;
diff --git a/lib/zebra.h b/lib/zebra.h
index c19c5e0aae..35d0cfbf5a 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -360,44 +360,6 @@ struct in_pktinfo {
#define strmatch(a,b) (!strcmp((a), (b)))
-/* Zebra message flags */
-
-/*
- * Cause Zebra to consider this routes nexthops recursively
- */
-#define ZEBRA_FLAG_ALLOW_RECURSION 0x01
-/*
- * This is a route that is read in on startup that was left around
- * from a previous run of FRR
- */
-#define ZEBRA_FLAG_SELFROUTE 0x02
-/*
- * This flag is used to tell Zebra that the BGP route being passed
- * down is a IBGP route
- */
-#define ZEBRA_FLAG_IBGP 0x04
-/*
- * This is a route that has been selected for FIB installation.
- * This flag is set in zebra and can be passed up to routing daemons
- */
-#define ZEBRA_FLAG_SELECTED 0x08
-/*
- * This is a route that we are telling Zebra that this route *must*
- * win and will be installed even over ZEBRA_FLAG_SELECTED
- */
-#define ZEBRA_FLAG_FIB_OVERRIDE 0x10
-/*
- * This flag tells Zebra that the route is a EVPN route and should
- * be treated specially
- */
-#define ZEBRA_FLAG_EVPN_ROUTE 0x20
-/*
- * This flag tells Zebra that it should treat the distance passed
- * down as an additional discriminator for route selection of the
- * route entry. This mainly is used for backup static routes.
- */
-#define ZEBRA_FLAG_RR_USE_DISTANCE 0x40
-
#ifndef INADDR_LOOPBACK
#define INADDR_LOOPBACK 0x7f000001 /* Internet address 127.0.0.1. */
#endif