mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-01-03 07:31:54 +00:00
Code Releases Activity

MPLS: Fix issue with recursive MPLS routes

Browse Source 
Recursive MPLS routes used hostentry from the original route, which
triggered different table than MPLS table, and therefore were not
updated.
This commit is contained in:
Ondrej Zajicek 2023-10-16 15:21:36 +02:00 committed by Maria Matejka
parent 3611555883
commit a0b4835253
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nest/mpls.c
View File

@ -838,10 +838,13 @@ mpls_announce_fec(struct mpls_fec_map *m, struct mpls_fec *fec, const rta *src)
const u32 *labels = &src->nh.label[src->nh.labels - src->nh.labels_orig]; const u32 *labels = &src->nh.label[src->nh.labels - src->nh.labels_orig];
mpls_label_stack ms; mpls_label_stack ms;
/* Apply the hostentry with the original labelstack */ /* Reconstruct the original labelstack */
ms.len = src->nh.labels_orig; ms.len = src->nh.labels_orig;
memcpy(ms.stack, labels, src->nh.labels_orig * sizeof(u32)); memcpy(ms.stack, labels, src->nh.labels_orig * sizeof(u32));
rta_apply_hostentry(a, src->hostentry, &ms);
/* The same hostentry, but different dependent table */
struct hostentry *s = src->hostentry;
rta_set_recursive_next_hop(m->channel->table, a, s->owner, s->addr, s->link, &ms);
} }
net_addr_mpls n = NET_ADDR_MPLS(fec->label); net_addr_mpls n = NET_ADDR_MPLS(fec->label);

3
nest/route.h
View File

@ -244,7 +244,8 @@ struct hostentry {
ip_addr addr; /* IP address of host, part of key */ ip_addr addr; /* IP address of host, part of key */
ip_addr link; /* (link-local) IP address of host, used as gw ip_addr link; /* (link-local) IP address of host, used as gw
if host is directly attached */ if host is directly attached */
struct rtable *tab; /* Dependent table, part of key */ rtable *tab; /* Dependent table, part of key */
rtable *owner; /* Nexthop owner table */
struct hostentry *next; /* Next in hash chain */ struct hostentry *next; /* Next in hash chain */
unsigned hash_key; /* Hash key */ unsigned hash_key; /* Hash key */
unsigned uc; /* Use count */ unsigned uc; /* Use count */

1
nest/rt-table.c
View File

@ -3659,6 +3659,7 @@ rt_get_hostentry(rtable *tab, ip_addr a, ip_addr ll, rtable *dep)
return he; return he;
he = hc_new_hostentry(hc, tab->rp, a, link, dep, k); he = hc_new_hostentry(hc, tab->rp, a, link, dep, k);
he->owner = tab;
rt_update_hostentry(tab, he); rt_update_hostentry(tab, he);
return he; return he;
} }