proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 21:10:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "bgpd: Move attr->pmsi_tnl_type to attr->extra->pmsi_tnl_type"

Browse Source 
This reverts commit fc6ba64f04.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
This commit is contained in:
Igor Ryzhov 2022-02-09 13:02:12 +03:00
parent f363420261
commit adde1db9f4
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bgpd/bgp_attr.h
View File

@ -160,9 +160,6 @@ struct bgp_attr_srv6_l3vpn {
}; };
struct attr_extra { struct attr_extra {
/* PMSI tunnel type (RFC 6514). */
enum pta_type pmsi_tnl_type;
/* Extended Communities attribute. */ /* Extended Communities attribute. */
struct ecommunity *ipv6_ecommunity; struct ecommunity *ipv6_ecommunity;
}; };
@ -190,6 +187,9 @@ struct attr {
/* Path origin attribute */ /* Path origin attribute */
uint8_t origin; uint8_t origin;
/* PMSI tunnel type (RFC 6514). */
enum pta_type pmsi_tnl_type;
/* has the route-map changed any attribute? /* has the route-map changed any attribute?
Used on the peer outbound side. */ Used on the peer outbound side. */
uint32_t rmap_change_flags; uint32_t rmap_change_flags;
@ -502,21 +502,15 @@ static inline uint32_t mac_mobility_seqnum(struct attr *attr)
return (attr) ? attr->mm_seqnum : 0; return (attr) ? attr->mm_seqnum : 0;
} }
static inline enum pta_type bgp_attr_get_pmsi_tnl_type(const struct attr *attr) static inline enum pta_type bgp_attr_get_pmsi_tnl_type(struct attr *attr)
{ {
if (attr->extra) return attr->pmsi_tnl_type;
return attr->extra->pmsi_tnl_type;
return PMSI_TNLTYPE_NO_INFO;
} }
static inline void bgp_attr_set_pmsi_tnl_type(struct attr *attr, static inline void bgp_attr_set_pmsi_tnl_type(struct attr *attr,
enum pta_type pmsi_tnl_type) enum pta_type pmsi_tnl_type)
{ {
if (!attr->extra) attr->pmsi_tnl_type = pmsi_tnl_type;
attr->extra = bgp_attr_extra_alloc();
attr->extra->pmsi_tnl_type = pmsi_tnl_type;
} }
static inline struct ecommunity * static inline struct ecommunity *