summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonatas Abraitis <donatas@opensourcerouting.org>2024-12-10 16:28:26 +0200
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-12-17 16:33:47 +0000
commit40e587b805206e95a45c8b113ff5cbfa78b80d74 (patch)
treee46471d266f33cba015c9a2db8ace5d7fb796d53
parent5958f4448a6b0ccacefa0bdc6cead9bf712b84bf (diff)
lib: Take ge/le into consideration when checking the prefix with the prefix-list
Without the fix: ``` show ip prefix-list test_1 10.20.30.96/27 first-match <no result> show ip prefix-list test_2 192.168.1.2/32 first-match <no result> ``` With the fix: ``` ip prefix-list test_1 seq 10 permit 10.20.30.64/26 le 27 ! end donatas# show ip prefix-list test_1 10.20.30.96/27 seq 10 permit 10.20.30.64/26 le 27 (hit count: 1, refcount: 0) donatas# show ip prefix-list test_1 10.20.30.64/27 seq 10 permit 10.20.30.64/26 le 27 (hit count: 2, refcount: 0) donatas# show ip prefix-list test_1 10.20.30.64/28 donatas# show ip prefix-list test_1 10.20.30.126/26 seq 10 permit 10.20.30.64/26 le 27 (hit count: 3, refcount: 0) donatas# show ip prefix-list test_1 10.20.30.126/30 donatas# ``` Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org> (cherry picked from commit dd4c2acc2e871283256f6cea16ede6d2d7f72dfe)
-rw-r--r--lib/plist.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/plist.c b/lib/plist.c
index 17e692d139..36af311e9e 100644
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -1108,8 +1108,10 @@ static int vty_show_prefix_list_prefix(struct vty *vty, afi_t afi,
match = 0;
if (type == normal_display || type == first_match_display)
- if (prefix_same(&p, &pentry->prefix))
+ if (prefix_list_entry_match(pentry, &p, false)) {
+ pentry->hitcnt++;
match = 1;
+ }
if (type == longer_display) {
if ((p.family == pentry->prefix.family)