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

Merge pull request #5815 from donaldsharp/feb_sa_stuff

Browse Source 
bgpd: Fix up a couple of new SA issues found
This commit is contained in:
Jafar Al-Gharaibeh 2020-02-16 23:41:55 -06:00 committed by GitHub
commit b5a3c5ef9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bgpd/bgp_nht.c
View File

@ -428,8 +428,10 @@ void bgp_parse_nexthop_update(int command, vrf_id_t vrf_id)
ifp = if_lookup_by_index(nexthop->ifindex, ifp = if_lookup_by_index(nexthop->ifindex,
nexthop->vrf_id); nexthop->vrf_id);
if (ifp)
zclient_send_interface_radv_req( zclient_send_interface_radv_req(
zclient, nexthop->vrf_id, ifp, true, zclient, nexthop->vrf_id, ifp,
true,
BGP_UNNUM_DEFAULT_RA_INTERVAL); BGP_UNNUM_DEFAULT_RA_INTERVAL);
} }
/* There is at least one label-switched path */ /* There is at least one label-switched path */
@ -898,8 +900,11 @@ void bgp_nht_register_enhe_capability_interfaces(struct peer *peer)
return; return;
for (nhop = bnc->nexthop; nhop; nhop = nhop->next) { for (nhop = bnc->nexthop; nhop; nhop = nhop->next) {
ifp = if_lookup_by_index(nhop->ifindex, ifp = if_lookup_by_index(nhop->ifindex, nhop->vrf_id);
nhop->vrf_id);
if (!ifp)
continue;
zclient_send_interface_radv_req(zclient, zclient_send_interface_radv_req(zclient,
nhop->vrf_id, nhop->vrf_id,
ifp, true, ifp, true,

16
bgpd/bgp_rpki.c
View File

@ -1412,7 +1412,6 @@ DEFUN (match_rpki,
ret = route_map_add_match(index, "rpki", argv[2]->arg, ret = route_map_add_match(index, "rpki", argv[2]->arg,
RMAP_EVENT_MATCH_ADDED); RMAP_EVENT_MATCH_ADDED);
if (ret) {
switch (ret) { switch (ret) {
case RMAP_RULE_MISSING: case RMAP_RULE_MISSING:
vty_out(vty, "%% BGP Can't find rule.\n"); vty_out(vty, "%% BGP Can't find rule.\n");
@ -1421,12 +1420,10 @@ DEFUN (match_rpki,
vty_out(vty, "%% BGP Argument is malformed.\n"); vty_out(vty, "%% BGP Argument is malformed.\n");
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
case RMAP_COMPILE_SUCCESS: case RMAP_COMPILE_SUCCESS:
/* return CMD_SUCCESS;
* Intentionally doing nothing here
*/
break; break;
} }
}
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -1445,22 +1442,19 @@ DEFUN (no_match_rpki,
ret = route_map_delete_match(index, "rpki", argv[3]->arg, ret = route_map_delete_match(index, "rpki", argv[3]->arg,
RMAP_EVENT_MATCH_DELETED); RMAP_EVENT_MATCH_DELETED);
if (ret) {
switch (ret) { switch (ret) {
case RMAP_RULE_MISSING: case RMAP_RULE_MISSING:
vty_out(vty, "%% BGP Can't find rule.\n"); vty_out(vty, "%% BGP Can't find rule.\n");
return CMD_WARNING_CONFIG_FAILED;
break; break;
case RMAP_COMPILE_ERROR: case RMAP_COMPILE_ERROR:
vty_out(vty, "%% BGP Argument is malformed.\n"); vty_out(vty, "%% BGP Argument is malformed.\n");
return CMD_WARNING_CONFIG_FAILED;
break; break;
case RMAP_COMPILE_SUCCESS: case RMAP_COMPILE_SUCCESS:
/* return CMD_SUCCESS;
* Nothing to do here
*/
break; break;
} }
return CMD_WARNING_CONFIG_FAILED;
}
return CMD_SUCCESS; return CMD_SUCCESS;
} }