Merge pull request #5686 from qlyoung/fix-bgp-fqdn-capability-leak

[mirror_frr.git] / bgpd / bgp_ecommunity.h

diff --git a/bgpd/bgp_ecommunity.h b/bgpd/bgp_ecommunity.h
index 62b213775391f64f599c94567a97423cacde894c..ae64f41ca15592b6425857218ac2f0d073e5e69e 100644 (file)
--- a/bgpd/bgp_ecommunity.h
+++ b/bgpd/bgp_ecommunity.h
@@ -22,6 +22,7 @@
 #define _QUAGGA_BGP_ECOMMUNITY_H
 
 #include "bgpd/bgp_route.h"
+#include "bgpd/bgpd.h"
 
 /* High-order octet of the Extended Communities type field.  */
 #define ECOMMUNITY_ENCODE_AS                0x00
@@ -104,8 +105,6 @@ struct ecommunity_val {
        char val[ECOMMUNITY_SIZE];
 };
 
-#define ecom_length(X)    ((X)->size * ECOMMUNITY_SIZE)
-
 /*
  * Encode BGP Route Target AS:nn.
  */
@@ -162,7 +161,7 @@ extern struct ecommunity *ecommunity_uniq_sort(struct ecommunity *);
 extern struct ecommunity *ecommunity_intern(struct ecommunity *);
 extern bool ecommunity_cmp(const void *arg1, const void *arg2);
 extern void ecommunity_unintern(struct ecommunity **);
-extern unsigned int ecommunity_hash_make(void *);
+extern unsigned int ecommunity_hash_make(const void *);
 extern struct ecommunity *ecommunity_str2com(const char *, int, int);
 extern char *ecommunity_ecom2str(struct ecommunity *, int, int);
 extern void ecommunity_strfree(char **s);
@@ -189,9 +188,18 @@ extern int ecommunity_fill_pbr_action(struct ecommunity_val *ecom_eval,
 extern void bgp_compute_aggregate_ecommunity(
                                        struct bgp_aggregate *aggregate,
                                        struct ecommunity *ecommunity);
+
+extern void bgp_compute_aggregate_ecommunity_hash(
+                                       struct bgp_aggregate *aggregate,
+                                       struct ecommunity *ecommunity);
+extern void bgp_compute_aggregate_ecommunity_val(
+                                       struct bgp_aggregate *aggregate);
 extern void bgp_remove_ecommunity_from_aggregate(
                                        struct bgp_aggregate *aggregate,
                                        struct ecommunity *ecommunity);
+extern void bgp_remove_ecomm_from_aggregate_hash(
+                                       struct bgp_aggregate *aggregate,
+                                       struct ecommunity *ecommunity);
 extern void bgp_aggr_ecommunity_remove(void *arg);
 
 #endif /* _QUAGGA_BGP_ECOMMUNITY_H */