bgpd: remove HAVE_EVPN references

This commit removes HAVE_EVPN references from bgpd folder

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>

diff --git a/bgpd/bgp_attr_evpn.c b/bgpd/bgp_attr_evpn.c
index 6f5a5ffc4986003bea5dc41b099669271f037442..26fc08f65850ab4814903e80c1d32f9066acbb81 100644 (file)
--- a/bgpd/bgp_attr_evpn.c
+++ b/bgpd/bgp_attr_evpn.c
@@ -286,7 +286,6 @@ char *ecom_mac2str(char *ecom_mac)
 /* dst prefix must be AF_INET or AF_INET6 prefix, to forge EVPN prefix */
 extern int bgp_build_evpn_prefix (int evpn_type, uint32_t eth_tag, struct prefix *dst)
 {
-#if defined(HAVE_EVPN)
   struct evpn_addr *p_evpn_p;
   struct prefix p2;
   struct prefix *src = &p2;
@@ -319,7 +318,4 @@ extern int bgp_build_evpn_prefix (int evpn_type, uint32_t eth_tag, struct prefix
   else
     return -1;
   return 0;
-#else
-  return -1;
-#endif /* !(HAVE_EVPN) */
 }

diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
index 98661d7c3843e6a7668fc248b2eec32563034400..b0b33c0b549cdeb95317140caa2e38db3df03a37 100644 (file)
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@ -58,9 +58,6 @@ bgp_nlri_parse_evpn (struct peer *peer, struct attr *attr,
   prd.family = AF_UNSPEC;
   prd.prefixlen = 64;
 
-#if !defined(HAVE_EVPN)
-  return -1;
-#else
   p_evpn_p = &p.u.prefix_evpn;
   pnt = packet->nlri;
   lim = pnt + packet->length;
@@ -183,7 +180,6 @@ bgp_nlri_parse_evpn (struct peer *peer, struct attr *attr,
   /* Packet length consistency check. */
   if (pnt != lim)
     return -1;
-#endif /* !(HAVE_EVPN) */
   return 0;
 }
 
@@ -192,7 +188,6 @@ bgp_packet_mpattr_route_type_5 (struct stream *s,
                                 struct prefix *p, struct prefix_rd *prd,
                                 u_char *label, struct attr *attr)
 {
-#if defined(HAVE_EVPN)
   int len;
   char temp[16];
   struct evpn_addr *p_evpn_p;
@@ -237,5 +232,4 @@ bgp_packet_mpattr_route_type_5 (struct stream *s,
   else
     stream_put3 (s, 0);
   return;
-#endif /* (HAVE_EVPN) */
 }

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 5f47e88a7807bfa1da3cad71310e13b2868320a0..085763ba8135dba21fcdc541e554dd15add17014 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -3994,9 +3994,7 @@ bgp_static_update_safi (struct bgp *bgp, struct prefix *p,
 #if ENABLE_BGP_VNC
   u_int32_t        label = 0;
 #endif
-#if defined(HAVE_EVPN)
   union gw_addr add;
-#endif /* (HAVE_EVPN) */
 
   assert (bgp_static);
 
@@ -4016,7 +4014,6 @@ bgp_static_update_safi (struct bgp *bgp, struct prefix *p,
           bgp_attr_extra_get (&attr)->mp_nexthop_len = IPV4_MAX_BYTELEN;
         }
     }
-#if defined(HAVE_EVPN)
   if(afi == AFI_L2VPN)
     {
       if (bgp_static->gatewayIp.family == AF_INET)
@@ -4036,7 +4033,6 @@ bgp_static_update_safi (struct bgp *bgp, struct prefix *p,
           bgp_add_routermac_ecom (&attr, bgp_static->router_mac);
         }
     }
-#endif /* (HAVE_EVPN) */
   /* Apply route-map. */
   if (bgp_static->rmap.name)
     {
@@ -4499,7 +4495,6 @@ bgp_static_set_safi (safi_t safi, struct vty *vty, const char *ip_str,
     {
       encode_label (0, tag);
     }
-#if defined (HAVE_EVPN)
   if (safi == SAFI_EVPN)
     {
       if( esi && str2esi (esi, NULL) == 0)
@@ -4529,7 +4524,6 @@ bgp_static_set_safi (safi_t safi, struct vty *vty, const char *ip_str,
             }
         }
     }
-#endif /* (HAVE_EVPN) */
   prn = bgp_node_get (bgp->route[afi][safi],
                        (struct prefix *)&prd);
   if (prn->info == NULL)
@@ -6614,7 +6608,6 @@ route_vty_out_overlay (struct vty *vty, struct prefix *p,
 
   if(attr->extra)
     {
-#if defined (HAVE_EVPN)
       struct eth_segment_id *id = &(attr->extra->evpn_overlay.eth_s_id);
       char *str = esi2str(id);
       vty_out (vty, "%s", str);
@@ -6629,7 +6622,6 @@ route_vty_out_overlay (struct vty *vty, struct prefix *p,
                    inet_ntop (AF_INET6, &(attr->extra->evpn_overlay.gw_ip.ipv6),
                               buf, BUFSIZ));
        }
-#endif /* (HAVE_EVPN) */
       if(attr->extra->ecommunity)
         {
           char *mac = NULL;
@@ -10554,11 +10546,9 @@ bgp_config_write_network_evpn (struct vty *vty, struct bgp *bgp,
             inet_ntop (AF_INET, &bgp_static->igpnexthop, buf2, SU_ADDRSTRLEN);
 
             prefix2str (p, buf, sizeof (buf)),
-#if defined (HAVE_EVPN)
            vty_out (vty, " network %s rd %s ethtag %u tag %u esi %s gwip %s routermac %s",
                     buf, rdbuf, p->u.prefix_evpn.eth_tag,
                      decode_label (bgp_static->tag), esi, buf2 , macrouter);
-#endif /*(HAVE_EVPN)*/
            vty_out (vty, "%s", VTY_NEWLINE);
          }
   return 0;

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 4564b9492f5f85731ba95f413d7178103e7fe610..896518fca3dab13a5df50b7e6b99c7f7d0804b86 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -5718,9 +5718,7 @@ DEFUN (address_family_evpn,
        "Layer2 VPN Address family\n"
        "Ethernet Virtual Private Network Subsequent Address Family\n")
 {
-#if defined(HAVE_EVPN)
   vty->node = BGP_EVPN_NODE;
-#endif /* HAVE_EVPN */
   return CMD_SUCCESS;
 }