lib: remove the dependency on bgpd code

The library code should not depend on a specific daemon's code.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>

diff --git a/bgpd/bgp_ecommunity.h b/bgpd/bgp_ecommunity.h
index a9dc2aeaa1f5a3c15e7880d0842dbb992d5fe845..03b23fcd37405e6d10d02474cc5b14fbe54aab20 100644 (file)
--- a/bgpd/bgp_ecommunity.h
+++ b/bgpd/bgp_ecommunity.h
@@ -151,12 +151,6 @@ struct ecommunity_val_ipv6 {
        char val[IPV6_ECOMMUNITY_SIZE];
 };
 
-enum ecommunity_lb_type {
-       EXPLICIT_BANDWIDTH,
-       CUMULATIVE_BANDWIDTH,
-       COMPUTED_BANDWIDTH
-};
-
 #define ecom_length_size(X, Y)    ((X)->size * (Y))
 
 /*

diff --git a/bgpd/bgp_routemap_nb_config.c b/bgpd/bgp_routemap_nb_config.c
index 398e7323db8b4f9598f66dc0ad5aa13216bffebd..d7ba986a2fe9ada2f1231ba9207b562f7b90e6f0 100644 (file)
--- a/bgpd/bgp_routemap_nb_config.c
+++ b/bgpd/bgp_routemap_nb_config.c
@@ -25,7 +25,6 @@
 #include "lib/routemap.h"
 #include "bgpd/bgpd.h"
 #include "bgpd/bgp_routemap_nb.h"
-#include "bgpd/bgp_ecommunity.h"
 
 /* Add bgp route map rule. */
 static int bgp_route_match_add(struct route_map_index *index,

diff --git a/lib/routemap.h b/lib/routemap.h
index 444508500160d0ee81302c2b706b00155cb2a0ac..1fbd142ad29c0d5aeaa42211bd565ffc068a3b16 100644 (file)
--- a/lib/routemap.h
+++ b/lib/routemap.h
@@ -379,6 +379,12 @@ DECLARE_QOBJ_TYPE(route_map);
 #define IS_SET_BGP_EVPN_GATEWAY_IP_IPV6(A)                                     \
        (strmatch(A, "frr-bgp-route-map:set-evpn-gateway-ip-ipv6"))
 
+enum ecommunity_lb_type {
+       EXPLICIT_BANDWIDTH,
+       CUMULATIVE_BANDWIDTH,
+       COMPUTED_BANDWIDTH
+};
+
 /* Prototypes. */
 extern void route_map_init(void);
 

diff --git a/lib/routemap_cli.c b/lib/routemap_cli.c
index 77455d991ab98aad7857fdfe93ed1a91d6d072bb..58c62e614fc9949560af91c31a9b7eab28807f9e 100644 (file)
--- a/lib/routemap_cli.c
+++ b/lib/routemap_cli.c
@@ -25,7 +25,6 @@
 #include "lib/command.h"
 #include "lib/northbound_cli.h"
 #include "lib/routemap.h"
-#include "bgpd/bgp_ecommunity.h"
 
 #ifndef VTYSH_EXTRACT_PL
 #include "lib/routemap_cli_clippy.c"