proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-07 00:16:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "bgpd: send bgp link-state prefixes"

Browse Source 
This reverts commit 0c94fb9cc8.

(cherry picked from commit f75d9050fc)
This commit is contained in:
Donald Sharp 2023-10-10 16:44:51 -04:00 committed by Mergify
parent d636ba86c0
commit f5132b151d
4 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bgpd/bgp_attr.c
View File

@ -40,7 +40,6 @@
#endif #endif
#include "bgp_evpn.h" #include "bgp_evpn.h"
#include "bgp_flowspec_private.h" #include "bgp_flowspec_private.h"
#include "bgp_linkstate_tlv.h"
#include "bgp_mac.h" #include "bgp_mac.h"
/* Attribute strings for logging. */ /* Attribute strings for logging. */
@ -4006,6 +4005,8 @@ size_t bgp_packet_mpattr_start(struct stream *s, struct peer *peer, afi_t afi,
switch (safi) { switch (safi) {
case SAFI_LINKSTATE: case SAFI_LINKSTATE:
case SAFI_LINKSTATE_VPN: case SAFI_LINKSTATE_VPN:
/* TODO */
break;
case SAFI_UNICAST: case SAFI_UNICAST:
case SAFI_MULTICAST: case SAFI_MULTICAST:
case SAFI_LABELED_UNICAST: case SAFI_LABELED_UNICAST:
@ -4041,6 +4042,8 @@ size_t bgp_packet_mpattr_start(struct stream *s, struct peer *peer, afi_t afi,
switch (safi) { switch (safi) {
case SAFI_LINKSTATE: case SAFI_LINKSTATE:
case SAFI_LINKSTATE_VPN: case SAFI_LINKSTATE_VPN:
/* TODO */
break;
case SAFI_UNICAST: case SAFI_UNICAST:
case SAFI_MULTICAST: case SAFI_MULTICAST:
case SAFI_LABELED_UNICAST: case SAFI_LABELED_UNICAST:
@ -4092,8 +4095,10 @@ size_t bgp_packet_mpattr_start(struct stream *s, struct peer *peer, afi_t afi,
} }
break; break;
case AFI_LINKSTATE: case AFI_LINKSTATE:
/* TODO */
break;
case AFI_L2VPN: case AFI_L2VPN:
if (nh_afi == AFI_L2VPN && safi != SAFI_FLOWSPEC) if (safi != SAFI_FLOWSPEC)
flog_err( flog_err(
EC_BGP_ATTR_NH_SEND_LEN, EC_BGP_ATTR_NH_SEND_LEN,
"Bad nexthop when sending to %s, AFI %u SAFI %u nhlen %d", "Bad nexthop when sending to %s, AFI %u SAFI %u nhlen %d",
@ -4145,10 +4150,8 @@ void bgp_packet_mpattr_prefix(struct stream *s, afi_t afi, safi_t safi,
addpath_tx_id); addpath_tx_id);
break; break;
case SAFI_LINKSTATE: case SAFI_LINKSTATE:
bgp_nlri_encode_linkstate(s, p);
break;
case SAFI_LINKSTATE_VPN: case SAFI_LINKSTATE_VPN:
/* not yet supported */ /* TODO */
break; break;
case SAFI_FLOWSPEC: case SAFI_FLOWSPEC:
stream_putc(s, p->u.prefix_flowspec.prefixlen); stream_putc(s, p->u.prefix_flowspec.prefixlen);
@ -4178,6 +4181,8 @@ size_t bgp_packet_mpattr_prefix_size(afi_t afi, safi_t safi,
break; break;
case SAFI_LINKSTATE: case SAFI_LINKSTATE:
case SAFI_LINKSTATE_VPN: case SAFI_LINKSTATE_VPN:
/* TODO */
break;
case SAFI_UNICAST: case SAFI_UNICAST:
case SAFI_MULTICAST: case SAFI_MULTICAST:
break; break;

14
bgpd/bgp_linkstate_tlv.c
View File

@ -71,17 +71,3 @@ int bgp_nlri_parse_linkstate(struct peer *peer, struct attr *attr,
} }
return BGP_NLRI_PARSE_OK; return BGP_NLRI_PARSE_OK;
} }
/*
* Encode Link-State prefix in Update (MP_REACH)
*/
void bgp_nlri_encode_linkstate(struct stream *s, const struct prefix *p)
{
/* NLRI type */
stream_putw(s, p->u.prefix_linkstate.nlri_type);
/* Size */
stream_putw(s, p->prefixlen);
stream_put(s, (const void *)p->u.prefix_linkstate.ptr, p->prefixlen);
}

1
bgpd/bgp_linkstate_tlv.h
View File

@ -8,6 +8,5 @@
extern int bgp_nlri_parse_linkstate(struct peer *peer, struct attr *attr, extern int bgp_nlri_parse_linkstate(struct peer *peer, struct attr *attr,
struct bgp_nlri *packet, int withdraw); struct bgp_nlri *packet, int withdraw);
extern void bgp_nlri_encode_linkstate(struct stream *s, const struct prefix *p);
#endif /* BGP_LINKSTATE_TLV_H */ #endif /* BGP_LINKSTATE_TLV_H */

10
bgpd/bgp_route.c
View File

@ -4729,8 +4729,8 @@ void bgp_update(struct peer *peer, const struct prefix *p, uint32_t addpath_id,
(safi == SAFI_UNICAST || safi == SAFI_LABELED_UNICAST || (safi == SAFI_UNICAST || safi == SAFI_LABELED_UNICAST ||
(safi == SAFI_MPLS_VPN && (safi == SAFI_MPLS_VPN &&
pi->sub_type != BGP_ROUTE_IMPORTED))) || pi->sub_type != BGP_ROUTE_IMPORTED))) ||
(safi == SAFI_EVPN && bgp_evpn_is_prefix_nht_supported(p)) || (safi == SAFI_EVPN &&
afi == AFI_LINKSTATE) { bgp_evpn_is_prefix_nht_supported(p))) {
if (safi != SAFI_EVPN && peer->sort == BGP_PEER_EBGP if (safi != SAFI_EVPN && peer->sort == BGP_PEER_EBGP
&& peer->ttl == BGP_DEFAULT_TTL && peer->ttl == BGP_DEFAULT_TTL
&& !CHECK_FLAG(peer->flags, && !CHECK_FLAG(peer->flags,
@ -4877,9 +4877,9 @@ void bgp_update(struct peer *peer, const struct prefix *p, uint32_t addpath_id,
/* Nexthop reachability check. */ /* Nexthop reachability check. */
if (((afi == AFI_IP || afi == AFI_IP6) && if (((afi == AFI_IP || afi == AFI_IP6) &&
(safi == SAFI_UNICAST || safi == SAFI_LABELED_UNICAST || (safi == SAFI_UNICAST || safi == SAFI_LABELED_UNICAST ||
(safi == SAFI_MPLS_VPN && new->sub_type != BGP_ROUTE_IMPORTED))) || (safi == SAFI_MPLS_VPN &&
(safi == SAFI_EVPN && bgp_evpn_is_prefix_nht_supported(p)) || new->sub_type != BGP_ROUTE_IMPORTED))) ||
afi == AFI_LINKSTATE) { (safi == SAFI_EVPN && bgp_evpn_is_prefix_nht_supported(p))) {
if (safi != SAFI_EVPN && peer->sort == BGP_PEER_EBGP if (safi != SAFI_EVPN && peer->sort == BGP_PEER_EBGP
&& peer->ttl == BGP_DEFAULT_TTL && peer->ttl == BGP_DEFAULT_TTL
&& !CHECK_FLAG(peer->flags, && !CHECK_FLAG(peer->flags,