johanels/akvorado
1
0
Fork 0
mirror of https://github.com/akvorado/akvorado.git synced 2025-12-11 22:14:02 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

outlet/routing: rename ipprefix to path

Browse Source 
This is a better match for GoBGPv4 naming.
This commit is contained in:
Vincent Bernat
2025-11-04 08:28:23 +01:00
parent 434fbdd4ef
commit eb61d75456
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
outlet/routing/provider/bmp/events.go
View File

@@ -294,8 +294,8 @@ func (p *Provider) handleRouteMonitoring(pkey peerKey, body *bmp.BMPRouteMonitor
// Regular NLRI and withdrawn routes // Regular NLRI and withdrawn routes
if pkey.ptype == bmp.BMP_PEER_TYPE_L3VPN || p.isAcceptedRD(0) { if pkey.ptype == bmp.BMP_PEER_TYPE_L3VPN || p.isAcceptedRD(0) {
// We know we have IPv4 NLRI // We know we have IPv4 NLRI
for _, ipprefix := range update.NLRI { for _, path := range update.NLRI {
v4UCPrefix, ok := ipprefix.NLRI.(*bgp.IPAddrPrefix) v4UCPrefix, ok := path.NLRI.(*bgp.IPAddrPrefix)
if !ok { if !ok {
continue continue
} }
@@ -304,7 +304,7 @@ func (p *Provider) handleRouteMonitoring(pkey peerKey, body *bmp.BMPRouteMonitor
peer: pinfo.reference, peer: pinfo.reference,
nlri: p.rib.nlris.Put(nlri{ nlri: p.rib.nlris.Put(nlri{
family: bgp.RF_IPv4_UC, family: bgp.RF_IPv4_UC,
path: ipprefix.ID, path: path.ID,
rd: pkey.distinguisher, rd: pkey.distinguisher,
}), }),
nextHop: p.rib.nextHops.Put(nextHop(nh)), nextHop: p.rib.nextHops.Put(nextHop(nh)),
@@ -312,15 +312,15 @@ func (p *Provider) handleRouteMonitoring(pkey peerKey, body *bmp.BMPRouteMonitor
prefixLen: uint8(pfx.Bits()), prefixLen: uint8(pfx.Bits()),
}) })
} }
for _, ipprefix := range update.WithdrawnRoutes { for _, path := range update.WithdrawnRoutes {
v4UCPrefix, ok := ipprefix.NLRI.(*bgp.IPAddrPrefix) v4UCPrefix, ok := path.NLRI.(*bgp.IPAddrPrefix)
if !ok { if !ok {
continue continue
} }
pfx := helpers.PrefixTo6(v4UCPrefix.Prefix) pfx := helpers.PrefixTo6(v4UCPrefix.Prefix)
if nlriRef, ok := p.rib.nlris.Ref(nlri{ if nlriRef, ok := p.rib.nlris.Ref(nlri{
family: bgp.RF_IPv4_UC, family: bgp.RF_IPv4_UC,
path: ipprefix.ID, path: path.ID,
rd: pkey.distinguisher, rd: pkey.distinguisher,
}); ok { }); ok {
removed += p.rib.RemovePrefix(pfx, route{ removed += p.rib.RemovePrefix(pfx, route{
@@ -333,21 +333,21 @@ func (p *Provider) handleRouteMonitoring(pkey peerKey, body *bmp.BMPRouteMonitor
// MP reach and unreach NLRI // MP reach and unreach NLRI
for _, attr := range update.PathAttributes { for _, attr := range update.PathAttributes {
var ipprefixes []bgp.PathNLRI var paths []bgp.PathNLRI
var family bgp.Family var family bgp.Family
switch attr := attr.(type) { switch attr := attr.(type) {
case *bgp.PathAttributeMpReachNLRI: case *bgp.PathAttributeMpReachNLRI:
nh = helpers.AddrTo6(attr.Nexthop) nh = helpers.AddrTo6(attr.Nexthop)
ipprefixes = attr.Value paths = attr.Value
family = bgp.NewFamily(attr.AFI, attr.SAFI) family = bgp.NewFamily(attr.AFI, attr.SAFI)
case *bgp.PathAttributeMpUnreachNLRI: case *bgp.PathAttributeMpUnreachNLRI:
ipprefixes = attr.Value paths = attr.Value
family = bgp.NewFamily(attr.AFI, attr.SAFI) family = bgp.NewFamily(attr.AFI, attr.SAFI)
} }
for _, ipprefix := range ipprefixes { for _, path := range paths {
var pfx netip.Prefix var pfx netip.Prefix
var rd RD var rd RD
switch nlri := ipprefix.NLRI.(type) { switch nlri := path.NLRI.(type) {
case *bgp.IPAddrPrefix: case *bgp.IPAddrPrefix:
pfx = helpers.PrefixTo6(nlri.Prefix) pfx = helpers.PrefixTo6(nlri.Prefix)
rd = pkey.distinguisher rd = pkey.distinguisher
@@ -377,7 +377,7 @@ func (p *Provider) handleRouteMonitoring(pkey peerKey, body *bmp.BMPRouteMonitor
nlri: p.rib.nlris.Put(nlri{ nlri: p.rib.nlris.Put(nlri{
family: family, family: family,
rd: rd, rd: rd,
path: ipprefix.ID, path: path.ID,
}), }),
nextHop: p.rib.nextHops.Put(nextHop(nh)), nextHop: p.rib.nextHops.Put(nextHop(nh)),
attributes: p.rib.rtas.Put(rta), attributes: p.rib.rtas.Put(rta),
@@ -387,7 +387,7 @@ func (p *Provider) handleRouteMonitoring(pkey peerKey, body *bmp.BMPRouteMonitor
if nlriRef, ok := p.rib.nlris.Ref(nlri{ if nlriRef, ok := p.rib.nlris.Ref(nlri{
family: family, family: family,
rd: rd, rd: rd,
path: ipprefix.ID, path: path.ID,
}); ok { }); ok {
removed += p.rib.RemovePrefix(pfx, route{ removed += p.rib.RemovePrefix(pfx, route{
peer: pinfo.reference, peer: pinfo.reference,