matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

lib: show route-map should not print (null)

Browse source 
This command:
route-map FOOBAR permit 10
 set ipv6 next-hop prefer-global
 set community 5060:12345 additive
!

When you issue a `show route-map ...` command displays this:

route-map: FOOBAR Invoked: 0 (0 milliseconds total) Optimization: enabled Processed Change: false
 permit, sequence 5 Invoked 0 (0 milliseconds total)
  Match clauses:
  Set clauses:
    ipv6 next-hop prefer-global (null)
    community 5060:12345 additive
  Call clause:
  Action:
    Exit routemap

Modify the code so that it no longer displays the NULL when there
is nothing to display.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2025-03-26 14:35:13 -04:00
parent 8ca4376e01
commit d682f42d5b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/routemap.c
View file

@ -1019,7 +1019,7 @@ static void vty_show_route_map_entry(struct vty *vty, struct route_map *map,
char buf[BUFSIZ]; char buf[BUFSIZ];
snprintf(buf, sizeof(buf), "%s %s", snprintf(buf, sizeof(buf), "%s %s",
rule->cmd->str, rule->rule_str); rule->cmd->str, rule->rule_str ? rule->rule_str : "");
json_array_string_add(json_sets, buf); json_array_string_add(json_sets, buf);
} }
@ -1064,7 +1064,7 @@ static void vty_show_route_map_entry(struct vty *vty, struct route_map *map,
for (rule = index->set_list.head; rule; for (rule = index->set_list.head; rule;
rule = rule->next) rule = rule->next)
vty_out(vty, " %s %s\n", rule->cmd->str, vty_out(vty, " %s %s\n", rule->cmd->str,
rule->rule_str); rule->rule_str ? rule->rule_str : "");
/* Call clause */ /* Call clause */
vty_out(vty, " Call clause:\n"); vty_out(vty, " Call clause:\n");