Skip to content

Commit

Permalink
Merge pull request FRRouting#16032 from Pdoijode/pdoijode/zebra-rt-de…
Browse files Browse the repository at this point in the history
…ny-fix

zebra: Deny the routes if ip protocol CLI refers to an undefined rmap
  • Loading branch information
riw777 authored May 21, 2024
2 parents c002c5c + 705e8ef commit 4bd1648
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions zebra/zebra_routemap.c
Original file line number Diff line number Diff line change
Expand Up @@ -299,8 +299,7 @@ int ip_protocol_rm_add(struct zebra_vrf *zvrf, const char *rmap, int rtype,
route_map_lookup_by_name(PROTO_RM_NAME(zvrf, afi, rtype));
route_map_counter_increment(PROTO_RM_MAP(zvrf, afi, rtype));

if (PROTO_RM_MAP(zvrf, afi, rtype)) {

if (PROTO_RM_NAME(zvrf, afi, rtype)) {
if (IS_ZEBRA_DEBUG_RIB_DETAILED)
zlog_debug(
"%u: IPv4 Routemap config for protocol %d scheduling RIB processing",
Expand All @@ -326,7 +325,7 @@ int ip_protocol_rm_del(struct zebra_vrf *zvrf, const char *rmap, int rtype,
if (!rmap || strcmp(rmap, PROTO_RM_NAME(zvrf, afi, rtype)) == 0) {

route_map_counter_decrement(PROTO_RM_MAP(zvrf, afi, rtype));
if (PROTO_RM_MAP(zvrf, afi, rtype)) {
if (PROTO_RM_NAME(zvrf, afi, rtype)) {
if (IS_ZEBRA_DEBUG_RIB_DETAILED)
zlog_debug(
"%u: IPv4 Routemap unconfig for protocol %d, scheduling RIB processing",
Expand Down

0 comments on commit 4bd1648

Please sign in to comment.