diff options
| author | Igor Ryzhov <iryzhov@nfware.com> | 2021-08-09 11:48:38 +0200 |
|---|---|---|
| committer | Igor Ryzhov <iryzhov@nfware.com> | 2021-08-09 11:48:38 +0200 |
| commit | aaddf974c5e450f223960c8323d500c638760030 (patch) | |
| tree | e7429919ca0ba754c64698da16dad0392196c50f /staticd | |
| parent | Merge pull request #8262 from reubendowle/fixes/nhrp-misc-fixes (diff) | |
| download | frr-aaddf974c5e450f223960c8323d500c638760030.tar.xz frr-aaddf974c5e450f223960c8323d500c638760030.zip | |
staticd: replace NB checks with assert
If there's no route table in a VRF, it's a hard bug - staticd will crash
on any subsequent action with this route anyway. So let's assert the
existence of a route table instead of returning an unrecoverable error.
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
Diffstat (limited to 'staticd')
| -rw-r--r-- | staticd/static_nb_config.c | 14 | ||||
| -rw-r--r-- | staticd/static_routes.c | 3 |
2 files changed, 1 insertions, 16 deletions
diff --git a/staticd/static_nb_config.c b/staticd/static_nb_config.c index 582b838ce..deeca97b0 100644 --- a/staticd/static_nb_config.c +++ b/staticd/static_nb_config.c @@ -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; } diff --git a/staticd/static_routes.c b/staticd/static_routes.c index 0ca0011d0..77a10092f 100644 --- a/staticd/static_routes.c +++ b/staticd/static_routes.c @@ -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); |