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

Merge pull request #6109 from volta-networks/feat_ldp_host_only

Browse Source 
ldpd:  host only filter
This commit is contained in:
Renato Westphal 2020-04-01 19:51:22 -03:00 committed by GitHub
commit 16a064ef24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 333 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ldpd/lde.c
View File

@ -1637,6 +1637,56 @@ lde_change_egress_label(int af)
NULL, 0);
}
void
lde_change_host_label(int af)
{
struct lde_nbr *ln;
struct fec *f;
struct fec_node *fn;
uint32_t new_label;
RB_FOREACH(f, fec_tree, &ft) {
fn = (struct fec_node *)f;
switch (af) {
case AF_INET:
if (fn->fec.type != FEC_TYPE_IPV4)
continue;
break;
case AF_INET6:
if (fn->fec.type != FEC_TYPE_IPV6)
continue;
break;
default:
fatalx("lde_change_host_label: unknown af");
}
/*
* If the local label has changed to NO_LABEL, send a label
* withdraw to all peers.
* If the local label has changed and it's different from
* NO_LABEL, send a label mapping to all peers advertising
* the new label.
* If the local label hasn't changed, do nothing
*/
new_label = lde_update_label(fn);
if (fn->local_label != new_label) {
if (new_label == NO_LABEL)
RB_FOREACH(ln, nbr_tree, &lde_nbrs)
lde_send_labelwithdraw(ln, fn,
NULL, NULL);
fn->local_label = new_label;
if (fn->local_label != NO_LABEL)
RB_FOREACH(ln, nbr_tree, &lde_nbrs)
lde_send_labelmapping(ln, fn, 0);
}
}
RB_FOREACH(ln, nbr_tree, &lde_nbrs)
lde_imsg_compose_ldpe(IMSG_MAPPING_ADD_END, ln->peerid, 0,
NULL, 0);
}
static int
lde_address_add(struct lde_nbr *ln, struct lde_addr *lde_addr)
{

1
ldpd/lde.h
View File

@ -183,6 +183,7 @@ void lde_req_del(struct lde_nbr *, struct lde_req *, int);
struct lde_wdraw *lde_wdraw_add(struct lde_nbr *, struct fec_node *);
void lde_wdraw_del(struct lde_nbr *, struct lde_wdraw *);
void lde_change_egress_label(int);
void lde_change_host_label(int);
struct lde_addr *lde_address_find(struct lde_nbr *, int,
union ldpd_addr *);

13
ldpd/ldpd.c
View File

@ -1319,6 +1319,7 @@ merge_af(int af, struct ldpd_af_conf *af_conf, struct ldpd_af_conf *xa)
int stop_init_backoff = 0;
int remove_dynamic_tnbrs = 0;
int change_egress_label = 0;
int change_host_label = 0;
int reset_nbrs_ipv4 = 0;
int reset_nbrs = 0;
int update_sockets = 0;
@ -1349,6 +1350,12 @@ merge_af(int af, struct ldpd_af_conf *af_conf, struct ldpd_af_conf *xa)
if ((af_conf->flags & F_LDPD_AF_EXPNULL) !=
(xa->flags & F_LDPD_AF_EXPNULL))
change_egress_label = 1;
/* changing config of host only fec filtering */
if ((af_conf->flags & F_LDPD_AF_ALLOCHOSTONLY)
!= (xa->flags & F_LDPD_AF_ALLOCHOSTONLY))
change_host_label = 1;
af_conf->flags = xa->flags;
/* update the transport address */
@ -1358,6 +1365,10 @@ merge_af(int af, struct ldpd_af_conf *af_conf, struct ldpd_af_conf *xa)
}
/* update ACLs */
if (strcmp(af_conf->acl_label_allocate_for,
xa->acl_label_allocate_for))
change_host_label = 1;
if (strcmp(af_conf->acl_label_advertise_to,
xa->acl_label_advertise_to) ||
strcmp(af_conf->acl_label_advertise_for,
@ -1391,6 +1402,8 @@ merge_af(int af, struct ldpd_af_conf *af_conf, struct ldpd_af_conf *xa)
case PROC_LDE_ENGINE:
if (change_egress_label)
lde_change_egress_label(af);
if (change_host_label)
lde_change_host_label(af);
break;
case PROC_LDP_ENGINE:
if (stop_init_backoff)

61
tests/topotests/ldp-oc-acl-topo1/r1/show_ldp_all_binding.ref Normal file
View File

@ -0,0 +1,61 @@
{
"bindings":[
{
"addressFamily":"ipv4",
"prefix":"1.1.1.1/32",
"neighborId":"0.0.0.0",
"localLabel":"imp-null",
"remoteLabel":"-",
"inUse":0
},
{
"addressFamily":"ipv4",
"prefix":"2.2.2.2/32",
"neighborId":"2.2.2.2",
"remoteLabel":"imp-null",
"inUse":1
},
{
"addressFamily":"ipv4",
"prefix":"3.3.3.3/32",
"neighborId":"2.2.2.2",
"inUse":1
},
{
"addressFamily":"ipv4",
"prefix":"4.4.4.4/32",
"neighborId":"0.0.0.0",
"remoteLabel":"-",
"inUse":0
},
{
"addressFamily":"ipv4",
"prefix":"10.0.1.0/24",
"neighborId":"2.2.2.2",
"localLabel":"imp-null",
"remoteLabel":"imp-null",
"inUse":0
},
{
"addressFamily":"ipv4",
"prefix":"10.0.2.0/24",
"neighborId":"2.2.2.2",
"remoteLabel":"imp-null",
"inUse":1
},
{
"addressFamily":"ipv4",
"prefix":"10.0.3.0/24",
"neighborId":"2.2.2.2",
"inUse":1
},
{
"addressFamily":"ipv4",
"prefix":"123.0.1.0/24",
"neighborId":"0.0.0.0",
"localLabel":"imp-null",
"remoteLabel":"-",
"inUse":0
}
]
}

63
tests/topotests/ldp-oc-acl-topo1/r2/show_ldp_all_binding.ref Normal file
View File

@ -0,0 +1,63 @@
{
"bindings":[
{
"addressFamily":"ipv4",
"prefix":"1.1.1.1/32",
"neighborId":"1.1.1.1",
"remoteLabel":"imp-null",
"inUse":1
},
{
"addressFamily":"ipv4",
"prefix":"2.2.2.2/32",
"neighborId":"0.0.0.0",
"localLabel":"imp-null",
"remoteLabel":"-",
"inUse":0
},
{
"addressFamily":"ipv4",
"prefix":"3.3.3.3/32",
"neighborId":"3.3.3.3",
"remoteLabel":"imp-null",
"inUse":1
},
{
"addressFamily":"ipv4",
"prefix":"4.4.4.4/32",
"neighborId":"0.0.0.0",
"remoteLabel":"-",
"inUse":0
},
{
"addressFamily":"ipv4",
"prefix":"10.0.1.0/24",
"neighborId":"1.1.1.1",
"localLabel":"imp-null",
"remoteLabel":"imp-null",
"inUse":0
},
{
"addressFamily":"ipv4",
"prefix":"10.0.2.0/24",
"neighborId":"3.3.3.3",
"localLabel":"imp-null",
"remoteLabel":"imp-null",
"inUse":0
},
{
"addressFamily":"ipv4",
"prefix":"10.0.3.0/24",
"neighborId":"3.3.3.3",
"remoteLabel":"imp-null",
"inUse":1
},
{
"addressFamily":"ipv4",
"prefix":"123.0.1.0/24",
"neighborId":"1.1.1.1",
"remoteLabel":"imp-null",
"inUse":1
}
]
}

61
tests/topotests/ldp-oc-acl-topo1/r3/show_ldp_all_binding.ref Normal file
View File

@ -0,0 +1,61 @@
{
"bindings":[
{
"addressFamily":"ipv4",
"prefix":"1.1.1.1/32",
"neighborId":"2.2.2.2",
"inUse":1
},
{
"addressFamily":"ipv4",
"prefix":"2.2.2.2/32",
"neighborId":"2.2.2.2",
"remoteLabel":"imp-null",
"inUse":1
},
{
"addressFamily":"ipv4",
"prefix":"3.3.3.3/32",
"neighborId":"0.0.0.0",
"localLabel":"imp-null",
"remoteLabel":"-",
"inUse":0
},
{
"addressFamily":"ipv4",
"prefix":"4.4.4.4/32",
"neighborId":"0.0.0.0",
"remoteLabel":"-",
"inUse":0
},
{
"addressFamily":"ipv4",
"prefix":"10.0.1.0/24",
"neighborId":"2.2.2.2",
"remoteLabel":"imp-null",
"inUse":1
},
{
"addressFamily":"ipv4",
"prefix":"10.0.2.0/24",
"neighborId":"2.2.2.2",
"localLabel":"imp-null",
"remoteLabel":"imp-null",
"inUse":0
},
{
"addressFamily":"ipv4",
"prefix":"10.0.3.0/24",
"neighborId":"0.0.0.0",
"localLabel":"imp-null",
"remoteLabel":"-",
"inUse":0
},
{
"addressFamily":"ipv4",
"prefix":"123.0.1.0/24",
"neighborId":"2.2.2.2",
"inUse":1
}
]
}

68
tests/topotests/ldp-oc-acl-topo1/r4/show_ldp_all_binding.ref Normal file
View File

@ -0,0 +1,68 @@
{
"bindings":[
{
"addressFamily":"ipv4",
"prefix":"1.1.1.1/32",
"neighborId":"0.0.0.0",
"localLabel":"imp-null",
"remoteLabel":"-",
"inUse":0
},
{
"addressFamily":"ipv4",
"prefix":"2.2.2.2/32",
"neighborId":"0.0.0.0",
"localLabel":"imp-null",
"remoteLabel":"-",
"inUse":0
},
{
"addressFamily":"ipv4",
"prefix":"3.3.3.3/32",
"neighborId":"0.0.0.0",
"localLabel":"imp-null",
"remoteLabel":"-",
"inUse":0
},
{
"addressFamily":"ipv4",
"prefix":"4.4.4.4/32",
"neighborId":"0.0.0.0",
"localLabel":"imp-null",
"remoteLabel":"-",
"inUse":0
},
{
"addressFamily":"ipv4",
"prefix":"10.0.1.0/24",
"neighborId":"0.0.0.0",
"localLabel":"imp-null",
"remoteLabel":"-",
"inUse":0
},
{
"addressFamily":"ipv4",
"prefix":"10.0.2.0/24",
"neighborId":"0.0.0.0",
"localLabel":"imp-null",
"remoteLabel":"-",
"inUse":0
},
{
"addressFamily":"ipv4",
"prefix":"10.0.3.0/24",
"neighborId":"0.0.0.0",
"localLabel":"imp-null",
"remoteLabel":"-",
"inUse":0
},
{
"addressFamily":"ipv4",
"prefix":"123.0.1.0/24",
"neighborId":"0.0.0.0",
"localLabel":"imp-null",
"remoteLabel":"-",
"inUse":0
}
]
}

16
tests/topotests/ldp-oc-acl-topo1/test_ldp_oc_acl_topo1.py
View File

@ -213,6 +213,22 @@ def test_ldp_bindings():
for rname in ['r1', 'r2', 'r3', 'r4']:
router_compare_json_output(rname, "show mpls ldp binding json", "show_ldp_binding.ref")
def test_ldp_bindings_all_routes():
logger.info("Test: verify LDP bindings after host filter removed")
tgen = get_topogen()
# Skip if previous fatal error condition is raised
if tgen.routers_have_failure():
pytest.skip(tgen.errors)
# remove ACL that blocks advertising everything but host routes */
cmd = 'vtysh -c \"configure terminal\" -c \"mpls ldp\" -c \"address-family ipv4\" -c \"no label local allocate host-routes\"'
tgen.net['r1'].cmd(cmd)
sleep(2)
for rname in ['r1', 'r2', 'r3', 'r4']:
router_compare_json_output(rname, "show mpls ldp binding json", "show_ldp_all_binding.ref")
# Memory leak test template
def test_memory_leak():
"Run the memory leak test and report results."