Merge pull request #2291 from qlyoung/top-cleanup

[mirror_frr.git] / bgpd / bgp_evpn_private.h

diff --git a/bgpd/bgp_evpn_private.h b/bgpd/bgp_evpn_private.h
index ce279005dc6dffa25b8b2e49d912ddd8b73a97e3..39a08e70364a6bf1b2e1b33096a76883020e8993 100644 (file)
--- a/bgpd/bgp_evpn_private.h
+++ b/bgpd/bgp_evpn_private.h
@@ -55,7 +55,7 @@ typedef enum {
 struct bgpevpn {
        vni_t vni;
        vrf_id_t tenant_vrf_id;
-       u_int32_t flags;
+       uint32_t flags;
 #define VNI_FLAG_CFGD              0x1  /* VNI is user configured */
 #define VNI_FLAG_LIVE              0x2  /* VNI is "live" */
 #define VNI_FLAG_RD_CFGD           0x4  /* RD is user configured. */
@@ -69,31 +69,31 @@ struct bgpevpn {
                                           /* Flag to indicate if we are
                                            * advertising the g/w mac ip for
                                            * this VNI*/
-                                          u_int8_t advertise_gw_macip;
+       uint8_t advertise_gw_macip;
 
-                                          /* Flag to indicate if we are
-                                           * advertising subnet for this VNI */
-                                          u_int8_t advertise_subnet;
+       /* Flag to indicate if we are
+        * advertising subnet for this VNI */
+       uint8_t advertise_subnet;
 
-                                          /* Id for deriving the RD
-                                           * automatically for this VNI */
-                                          u_int16_t rd_id;
+       /* Id for deriving the RD
+        * automatically for this VNI */
+       uint16_t rd_id;
 
-                                          /* RD for this VNI. */
-                                          struct prefix_rd prd;
+       /* RD for this VNI. */
+       struct prefix_rd prd;
 
-                                          /* Route type 3 field */
-                                          struct in_addr originator_ip;
+       /* Route type 3 field */
+       struct in_addr originator_ip;
 
-                                          /* Import and Export RTs. */
-                                          struct list *import_rtl;
-                                          struct list *export_rtl;
+       /* Import and Export RTs. */
+       struct list *import_rtl;
+       struct list *export_rtl;
 
-                                          /* Route table for EVPN routes for
-                                           * this VNI. */
-                                          struct bgp_table *route_table;
+       /* Route table for EVPN routes for
+        * this VNI. */
+       struct bgp_table *route_table;
 
-                                          QOBJ_FIELDS
+       QOBJ_FIELDS
 };
 
 DECLARE_QOBJ_TYPE(bgpevpn)
@@ -254,7 +254,7 @@ static inline void encode_default_gw_extcomm(struct ecommunity_val *eval)
        eval->val[1] = ECOMMUNITY_EVPN_SUBTYPE_DEF_GW;
 }
 
-static inline void encode_mac_mobility_extcomm(int static_mac, u_int32_t seq,
+static inline void encode_mac_mobility_extcomm(int static_mac, uint32_t seq,
                                               struct ecommunity_val *eval)
 {
        memset(eval, 0, sizeof(*eval));
@@ -272,15 +272,15 @@ static inline void ip_prefix_from_type5_prefix(struct prefix_evpn *evp,
                                               struct prefix *ip)
 {
        memset(ip, 0, sizeof(struct prefix));
-       if (IS_EVPN_PREFIX_IPADDR_V4(evp)) {
+       if (is_evpn_prefix_ipaddr_v4(evp)) {
                ip->family = AF_INET;
-               ip->prefixlen = evp->prefix.ip_prefix_length;
-               memcpy(&(ip->u.prefix4), &(evp->prefix.ip.ip),
+               ip->prefixlen = evp->prefix.prefix_addr.ip_prefix_length;
+               memcpy(&(ip->u.prefix4), &(evp->prefix.prefix_addr.ip.ip),
                       IPV4_MAX_BYTELEN);
-       } else if (IS_EVPN_PREFIX_IPADDR_V6(evp)) {
+       } else if (is_evpn_prefix_ipaddr_v6(evp)) {
                ip->family = AF_INET6;
-               ip->prefixlen = evp->prefix.ip_prefix_length;
-               memcpy(&(ip->u.prefix6), &(evp->prefix.ip.ip),
+               ip->prefixlen = evp->prefix.prefix_addr.ip_prefix_length;
+               memcpy(&(ip->u.prefix6), &(evp->prefix.prefix_addr.ip.ip),
                       IPV6_MAX_BYTELEN);
        }
 }
@@ -290,26 +290,36 @@ static inline int is_evpn_prefix_default(struct prefix *evp)
        if (evp->family != AF_EVPN)
                return 0;
 
-       return ((evp->u.prefix_evpn.ip_prefix_length  == 0) ? 1 : 0);
+       return ((evp->u.prefix_evpn.prefix_addr.ip_prefix_length  == 0) ?
+               1 : 0);
 }
 
 static inline void ip_prefix_from_type2_prefix(struct prefix_evpn *evp,
                                               struct prefix *ip)
 {
        memset(ip, 0, sizeof(struct prefix));
-       if (IS_EVPN_PREFIX_IPADDR_V4(evp)) {
+       if (is_evpn_prefix_ipaddr_v4(evp)) {
                ip->family = AF_INET;
                ip->prefixlen = IPV4_MAX_BITLEN;
-               memcpy(&(ip->u.prefix4), &(evp->prefix.ip.ip),
+               memcpy(&(ip->u.prefix4), &(evp->prefix.macip_addr.ip.ip),
                       IPV4_MAX_BYTELEN);
-       } else if (IS_EVPN_PREFIX_IPADDR_V6(evp)) {
+       } else if (is_evpn_prefix_ipaddr_v6(evp)) {
                ip->family = AF_INET6;
                ip->prefixlen = IPV6_MAX_BITLEN;
-               memcpy(&(ip->u.prefix6), &(evp->prefix.ip.ip),
+               memcpy(&(ip->u.prefix6), &(evp->prefix.macip_addr.ip.ip),
                       IPV6_MAX_BYTELEN);
        }
 }
 
+static inline void ip_prefix_from_evpn_prefix(struct prefix_evpn *evp,
+                                             struct prefix *ip)
+{
+       if (evp->prefix.route_type == BGP_EVPN_MAC_IP_ROUTE)
+               ip_prefix_from_type2_prefix(evp, ip);
+       else if (evp->prefix.route_type == BGP_EVPN_IP_PREFIX_ROUTE)
+               ip_prefix_from_type5_prefix(evp, ip);
+}
+
 static inline void build_evpn_type2_prefix(struct prefix_evpn *p,
                                           struct ethaddr *mac,
                                           struct ipaddr *ip)
@@ -318,10 +328,10 @@ static inline void build_evpn_type2_prefix(struct prefix_evpn *p,
        p->family = AF_EVPN;
        p->prefixlen = EVPN_TYPE_2_ROUTE_PREFIXLEN;
        p->prefix.route_type = BGP_EVPN_MAC_IP_ROUTE;
-       memcpy(&p->prefix.mac.octet, mac->octet, ETH_ALEN);
-       p->prefix.ip.ipa_type = IPADDR_NONE;
+       memcpy(&p->prefix.macip_addr.mac.octet, mac->octet, ETH_ALEN);
+       p->prefix.macip_addr.ip.ipa_type = IPADDR_NONE;
        if (ip)
-               memcpy(&p->prefix.ip, ip, sizeof(*ip));
+               memcpy(&p->prefix.macip_addr.ip, ip, sizeof(*ip));
 }
 
 static inline void build_type5_prefix_from_ip_prefix(struct prefix_evpn *evp,
@@ -343,10 +353,10 @@ static inline void build_type5_prefix_from_ip_prefix(struct prefix_evpn *evp,
        memset(evp, 0, sizeof(struct prefix_evpn));
        evp->family = AF_EVPN;
        evp->prefixlen = EVPN_TYPE_5_ROUTE_PREFIXLEN;
-       evp->prefix.ip_prefix_length = ip_prefix->prefixlen;
        evp->prefix.route_type = BGP_EVPN_IP_PREFIX_ROUTE;
-       evp->prefix.ip.ipa_type = ip.ipa_type;
-       memcpy(&evp->prefix.ip, &ip, sizeof(struct ipaddr));
+       evp->prefix.prefix_addr.ip_prefix_length = ip_prefix->prefixlen;
+       evp->prefix.prefix_addr.ip.ipa_type = ip.ipa_type;
+       memcpy(&evp->prefix.prefix_addr.ip, &ip, sizeof(struct ipaddr));
 }
 
 static inline void build_evpn_type3_prefix(struct prefix_evpn *p,
@@ -356,8 +366,8 @@ static inline void build_evpn_type3_prefix(struct prefix_evpn *p,
        p->family = AF_EVPN;
        p->prefixlen = EVPN_TYPE_3_ROUTE_PREFIXLEN;
        p->prefix.route_type = BGP_EVPN_IMET_ROUTE;
-       p->prefix.ip.ipa_type = IPADDR_V4;
-       p->prefix.ip.ipaddr_v4 = originator_ip;
+       p->prefix.imet_addr.ip.ipa_type = IPADDR_V4;
+       p->prefix.imet_addr.ip.ipaddr_v4 = originator_ip;
 }
 
 static inline int evpn_default_originate_set(struct bgp *bgp, afi_t afi,
@@ -385,6 +395,7 @@ extern void bgp_evpn_unconfigure_import_rt_for_vrf(struct bgp *bgp_vrf,
                                                   struct ecommunity *ecomdel);
 extern int bgp_evpn_handle_export_rt_change(struct bgp *bgp,
                                            struct bgpevpn *vpn);
+extern void bgp_evpn_handle_autort_change(struct bgp *bgp);
 extern void bgp_evpn_handle_vrf_rd_change(struct bgp *bgp_vrf, int withdraw);
 extern void bgp_evpn_handle_rd_change(struct bgp *bgp, struct bgpevpn *vpn,
                                      int withdraw);