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

Merge pull request #9338 from idryzhov/static-nb-err

Browse Source 
staticd: replace NB checks with assert
This commit is contained in:
Renato Westphal 2021-08-13 22:17:31 -03:00 committed by GitHub
commit a01b086340
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
staticd/static_nb_config.c
View File

@ -471,13 +471,6 @@ int routing_control_plane_protocols_control_plane_protocol_staticd_route_list_cr
yang_afi_safi_identity2value(afi_safi, &afi, &safi);
rn = static_add_route(afi, safi, &prefix, NULL, s_vrf);
if (!rn) {
flog_warn(
EC_LIB_NB_CB_CONFIG_APPLY,
"route node %s creation failed",
yang_dnode_get_string(args->dnode, "./prefix"));
return NB_ERR;
}
if (vrf->vrf_id == VRF_UNKNOWN)
snprintf(
args->errmsg, args->errmsg_len,
@ -752,13 +745,6 @@ int routing_control_plane_protocols_control_plane_protocol_staticd_route_list_sr
afi = family2afi(src_prefix.family);
src_rn =
static_add_route(afi, safi, &rn->p, &src_prefix, s_vrf);
if (!src_rn) {
flog_warn(EC_LIB_NB_CB_CONFIG_APPLY,
"src rn %s creation failed",
yang_dnode_get_string(args->dnode,
"./src-prefix"));
return NB_ERR;
}
nb_running_set_entry(args->dnode, src_rn);
break;
}

3
staticd/static_routes.c
View File

@ -126,8 +126,7 @@ struct route_node *static_add_route(afi_t afi, safi_t safi, struct prefix *p,
struct static_route_info *si;
struct route_table *stable = svrf->stable[afi][safi];
if (!stable)
return NULL;
assert(stable);
/* Lookup static route prefix. */
rn = srcdest_rnode_get(stable, p, src_p);