diff options
| author | Rafael Zalamena <rzalamena@opensourcerouting.org> | 2020-05-01 11:45:45 -0300 |
|---|---|---|
| committer | Rafael Zalamena <rzalamena@opensourcerouting.org> | 2020-06-05 14:36:54 -0300 |
| commit | 88b8bfdc8af8e9ea45d8b7149efd9fcc8fc2e95f (patch) | |
| tree | 1778a49002f2e7352bf8158c7689c03eaa49f7b0 /lib/filter_cli.c | |
| parent | 744ad1afb4f889494fb809242ae08609f0b1db68 (diff) | |
lib: fix two filter cli problems
- Show the correct cisco style access list extended information.
- `assert` action so static analyzer doesn't complain about possible
NULL usage.
Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
Diffstat (limited to 'lib/filter_cli.c')
| -rw-r--r-- | lib/filter_cli.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/filter_cli.c b/lib/filter_cli.c index af24d8752c..b3d038bec3 100644 --- a/lib/filter_cli.c +++ b/lib/filter_cli.c @@ -505,14 +505,16 @@ void access_list_legacy_show(struct vty *vty, struct lyd_node *dnode, vty_out(vty, " any"); if (extended) { - if (yang_dnode_exists(dnode, "./network")) { - yang_dnode_get_prefix(&p, dnode, "./network"); + if (yang_dnode_exists(dnode, "./destination-network")) { + yang_dnode_get_prefix(&p, dnode, + "./destination-network"); masklen2ip(p.prefixlen, &mask); vty_out(vty, " %pI4 %pI4", &p.u.prefix4, &mask); - } else if (yang_dnode_exists(dnode, "./host")) + } else if (yang_dnode_exists(dnode, "./destination-host")) vty_out(vty, " host %s", - yang_dnode_get_string(dnode, "./host")); - else if (yang_dnode_exists(dnode, "./any")) + yang_dnode_get_string(dnode, + "./destination-host")); + else if (yang_dnode_exists(dnode, "./destination-any")) vty_out(vty, " any"); } @@ -1259,6 +1261,7 @@ static int plist_remove(struct vty *vty, const char *iptype, const char *name, return CMD_WARNING; /* Use access-list data structure to fetch sequence. */ + assert(action != NULL); if (strcmp(action, "permit") == 0) plt = PREFIX_PERMIT; else |