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

Fixed L3VPN after merge to v3.

Browse Source 
Semantics of rt_get_source() has changed between v2 and v3. Also other
minor fixes were needed to make it run.
This commit is contained in:
Maria Matejka 2024-01-23 20:25:48 +01:00
parent 06030d8bf0
commit 3b217f2984
3 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
nest/mpls.c
View File

@ -649,20 +649,21 @@ mpls_channel_start(struct channel *C)
return 0; return 0;
c->mpls_map = mpls_fec_map_new(C->proto->pool, C->proto->loop, C, c->rts); c->mpls_map = mpls_fec_map_new(C->proto->pool, C->proto->loop, C, c->rts);
c->mpls_map->vrf_iface = C->proto->vrf;
return 0; return 0;
} }
/*
static void static void
mpls_channel_shutdown(struct channel *C) mpls_channel_shutdown(struct channel *C)
{ {
struct mpls_channel *c = (void *) C; struct mpls_channel *c = (void *) C;
if (!c->rts) if (!c->rts)
return; return;
ev_send_loop(c->mpls_map->loop, c->mpls_map->cleanup_event);
} }
*/
static void static void
mpls_channel_cleanup(struct channel *C) mpls_channel_cleanup(struct channel *C)
@ -738,7 +739,7 @@ struct channel_class channel_mpls = {
.config_size = sizeof(struct mpls_channel_config), .config_size = sizeof(struct mpls_channel_config),
.init = mpls_channel_init, .init = mpls_channel_init,
.start = mpls_channel_start, .start = mpls_channel_start,
// .shutdown = mpls_channel_shutdown, .shutdown = mpls_channel_shutdown,
.cleanup = mpls_channel_cleanup, .cleanup = mpls_channel_cleanup,
.reconfigure = mpls_channel_reconfigure, .reconfigure = mpls_channel_reconfigure,
}; };
@ -798,7 +799,6 @@ mpls_fec_map_new(pool *pp, struct birdloop *loop, struct channel *C, uint rts)
m->cleanup_event = ev_new_init(p, mpls_fec_map_cleanup, m); m->cleanup_event = ev_new_init(p, mpls_fec_map_cleanup, m);
m->channel = C; m->channel = C;
channel_add_obstacle(C); channel_add_obstacle(C);
ev_send_loop(loop, m->cleanup_event);
m->domain = c->domain; m->domain = c->domain;
MPLS_RANGE_LOCKED(c->range, r) MPLS_RANGE_LOCKED(c->range, r)
@ -895,6 +895,8 @@ mpls_fec_map_cleanup(void *_m)
finished = 0; finished = 0;
HASH_WALK_DELSAFE_END; HASH_WALK_DELSAFE_END;
DBGL("FEC Map %p Cleanup: %sfinished", m, finished ? "" : "not ");
if (finished) if (finished)
{ {
ev_postpone(m->cleanup_event); ev_postpone(m->cleanup_event);
@ -981,7 +983,8 @@ mpls_get_fec_by_label(struct mpls_fec_map *m, u32 label)
if (fec) if (fec)
{ {
if (fec->policy == MPLS_POLICY_STATIC) DBGL("FEC %p found for lab %u in %p, policy %u", fec, label, m, fec->policy);
if (fec->policy != MPLS_POLICY_STATIC)
return NULL; return NULL;
mpls_revive_fec(fec); mpls_revive_fec(fec);
@ -1008,7 +1011,7 @@ mpls_get_fec_by_label(struct mpls_fec_map *m, u32 label)
fec->policy = MPLS_POLICY_STATIC; fec->policy = MPLS_POLICY_STATIC;
fec->handle = m->static_handle; fec->handle = m->static_handle;
DBGL("New FEC lab %u", fec->label); DBGL("New FEC lab %u map %p", fec->label, m);
return fec; return fec;
} }
@ -1044,7 +1047,7 @@ mpls_get_fec_by_net(struct mpls_fec_map *m, const net_addr *net, u64 path_id)
fec->policy = MPLS_POLICY_PREFIX; fec->policy = MPLS_POLICY_PREFIX;
fec->handle = m->handle; fec->handle = m->handle;
DBGL("New FEC net %u", fec->label); DBGL("New FEC net %u map %p", fec->label, m);
HASH_INSERT2(m->net_hash, NET, m->pool, fec); HASH_INSERT2(m->net_hash, NET, m->pool, fec);
@ -1086,7 +1089,7 @@ mpls_get_fec_by_destination(struct mpls_fec_map *m, ea_list *dest)
fec->policy = MPLS_POLICY_AGGREGATE; fec->policy = MPLS_POLICY_AGGREGATE;
fec->handle = m->handle; fec->handle = m->handle;
DBGL("New FEC rta %u", fec->label); DBGL("New FEC rta %u map %p", fec->label, m);
HASH_INSERT2(m->attrs_hash, RTA, m->pool, fec); HASH_INSERT2(m->attrs_hash, RTA, m->pool, fec);
@ -1117,7 +1120,7 @@ mpls_get_fec_for_vrf(struct mpls_fec_map *m)
fec->handle = m->handle; fec->handle = m->handle;
fec->iface = m->vrf_iface; fec->iface = m->vrf_iface;
DBGL("New FEC vrf %u", fec->label); DBGL("New FEC vrf %u map %p", fec->label, m);
m->vrf_fec = fec; m->vrf_fec = fec;
@ -1134,12 +1137,14 @@ mpls_unlink_fec(struct mpls_fec_map *m, struct mpls_fec *fec)
break; break;
case MPLS_POLICY_PREFIX: case MPLS_POLICY_PREFIX:
DBGL("Unlink FEC %p %u from net_hash");
HASH_REMOVE2(m->net_hash, NET, m->pool, fec); HASH_REMOVE2(m->net_hash, NET, m->pool, fec);
break; break;
case MPLS_POLICY_AGGREGATE: case MPLS_POLICY_AGGREGATE:
ea_free(fec->rta->l); DBGL("Unlink FEC %p %u from attrs_hash (%d) at %p", fec, fec->label, m->attrs_hash.count, m);
HASH_REMOVE2(m->attrs_hash, RTA, m->pool, fec); HASH_REMOVE2(m->attrs_hash, RTA, m->pool, fec);
ea_free(fec->rta->l);
break; break;
case MPLS_POLICY_VRF: case MPLS_POLICY_VRF:
@ -1205,9 +1210,7 @@ mpls_damage_fec(struct mpls_fec_map *m UNUSED, struct mpls_fec *fec)
static struct ea_storage * static struct ea_storage *
mpls_get_key_attrs(struct mpls_fec_map *m, ea_list *src) mpls_get_key_attrs(struct mpls_fec_map *m, ea_list *src)
{ {
EA_LOCAL_LIST(4) ea = { EA_LOCAL_LIST(4) ea = {};
.l.flags = EALF_SORTED,
};
uint last_id = 0; uint last_id = 0;
#define PUT_ATTR(cls) do { \ #define PUT_ATTR(cls) do { \

6
nest/rt-table.c
View File

@ -596,7 +596,10 @@ static inline void
channel_rte_trace_in(uint flag, struct channel *c, const rte *e, const char *msg) channel_rte_trace_in(uint flag, struct channel *c, const rte *e, const char *msg)
{ {
if ((c->debug & flag) || (c->proto->debug & flag)) if ((c->debug & flag) || (c->proto->debug & flag))
rte_trace(c->in_req.name, e, '>', msg); log(L_TRACE "%s > %s %N (-) src %luL %uG %uS id %u %s",
c->in_req.name, msg, e->net,
e->src->private_id, e->src->global_id, e->stale_cycle, e->id,
rta_dest_name(rte_dest(e)));
} }
static inline void static inline void
@ -1789,6 +1792,7 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
if (new) if (new)
{ {
new->net = n; new->net = n;
new->sender = c->in_req.hook;
int fr; int fr;

14
proto/l3vpn/l3vpn.c
View File

@ -161,14 +161,14 @@ l3vpn_rt_notify(struct proto *P, struct channel *c0, const net_addr *n0, rte *ne
{ {
case NET_IP4: case NET_IP4:
net_fill_vpn4(n, net4_prefix(n0), net4_pxlen(n0), p->rd); net_fill_vpn4(n, net4_prefix(n0), net4_pxlen(n0), p->rd);
src = p->p.main_source; rt_lock_source(src = p->p.main_source);
dst = p->vpn4_channel; dst = p->vpn4_channel;
export = 1; export = 1;
break; break;
case NET_IP6: case NET_IP6:
net_fill_vpn6(n, net6_prefix(n0), net6_pxlen(n0), p->rd); net_fill_vpn6(n, net6_prefix(n0), net6_pxlen(n0), p->rd);
src = p->p.main_source; rt_lock_source(src = p->p.main_source);
dst = p->vpn6_channel; dst = p->vpn6_channel;
export = 1; export = 1;
break; break;
@ -191,11 +191,11 @@ l3vpn_rt_notify(struct proto *P, struct channel *c0, const net_addr *n0, rte *ne
return; return;
} }
const struct adata *ecad = ea_get_adata(new->attrs, ea_bgp_ext_community);
struct nexthop_adata *nhad_orig = rte_get_nexthops(new);
if (new) if (new)
{ {
const struct adata *ecad = ea_get_adata(new->attrs, ea_bgp_ext_community);
struct nexthop_adata *nhad_orig = rte_get_nexthops(new);
new->src = src; new->src = src;
ea_set_attr_u32(&new->attrs, &ea_gen_source, 0, RTS_L3VPN); ea_set_attr_u32(&new->attrs, &ea_gen_source, 0, RTS_L3VPN);
@ -241,6 +241,8 @@ l3vpn_rt_notify(struct proto *P, struct channel *c0, const net_addr *n0, rte *ne
{ {
rte_update(dst, n, NULL, src); rte_update(dst, n, NULL, src);
} }
rt_unlock_source(src);
} }
@ -410,8 +412,6 @@ l3vpn_start(struct proto *P)
l3vpn_prepare_import_targets(p); l3vpn_prepare_import_targets(p);
l3vpn_prepare_export_targets(p); l3vpn_prepare_export_targets(p);
SKIP_BACK(struct mpls_channel, c, P->mpls_channel)->mpls_map->vrf_iface = P->vrf;
return PS_UP; return PS_UP;
} }